From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Mon, 6 May 2019 08:17:46 +0000 (+0200)
Subject: upgpkg: nix 2.2.2-2
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FAUR.git;a=commitdiff_plain;h=6fe662d2166570a8b2de1eca45c3f07933c5b4fa;hp=-c

upgpkg: nix 2.2.2-2

Merge subtree 'nix'
---

6fe662d2166570a8b2de1eca45c3f07933c5b4fa
diff --combined nix/.SRCINFO
index d0f6f15,8a00b07..51e5041
--- a/nix/.SRCINFO
+++ b/nix/.SRCINFO
@@@ -1,7 -1,7 +1,7 @@@
  pkgbase = nix
  	pkgdesc = A purely functional package manager
  	pkgver = 2.2.2
- 	pkgrel = 1
+ 	pkgrel = 2
  	url = https://nixos.org/nix
  	install = nix.install
  	arch = i686
@@@ -9,14 -9,12 +9,13 @@@
  	arch = armv7h
  	license = LGPL
  	makedepends = bzip2
- 	makedepends = gc
  	makedepends = openssl
  	depends = gc
  	depends = libsodium
  	depends = boost
  	depends = brotli
  	depends = editline
 +	depends = dash-static
  	source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz
  	sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c
  
diff --combined nix/PKGBUILD
index faea9db,7b68c7a..8005698
--- a/nix/PKGBUILD
+++ b/nix/PKGBUILD
@@@ -8,18 -8,17 +8,17 @@@
  
  pkgname=nix
  pkgver=2.2.2
- pkgrel=1
+ pkgrel=2
  pkgdesc="A purely functional package manager"
  arch=('i686' 'x86_64' 'armv7h')
  url="https://nixos.org/nix"
  license=('LGPL')
 -depends=('gc' 'libsodium' 'boost' 'brotli' 'editline')
 +depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'dash-static')
- makedepends=('bzip2' 'gc' 'openssl')
+ makedepends=('bzip2' 'openssl')
  install=nix.install
  source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz")
  sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c')
  
- 
  prepare() {
    cd "$pkgname-$pkgver"
  }
@@@ -29,7 -28,6 +28,7 @@@ build () 
    ./configure --prefix=/usr \
                --libexecdir="/usr/lib/$pkgname" \
                --sysconfdir=/etc \
 +              --with-sandbox-shell=/usr/bin/dash-static \
                --enable-gc
    make
  }