upgpkg: nix 2.2.2-1

upstream release

Merge subtree 'nix'

diff --git a/.SRCINFO b/.SRCINFO
index 562a12e6fc512fec2dbaafef72c11042560aa839..d0f6f1508be49f2b0b2067981b04d6fc3d8cdcbf 100644 (file)
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,8 @@ pkgbase = nix
        depends = libsodium
        depends = boost
        depends = brotli
-       depends = readline
+       depends = editline
+       depends = dash-static
        source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz
        sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c
 

diff --git a/PKGBUILD b/PKGBUILD
index ac476676a64f15529df88a3cc3f72fa65a089d6a..faea9dbf4c22588a22bdd9207ab04f953be7ad41 100644 (file)
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgdesc="A purely functional package manager"
 arch=('i686' 'x86_64' 'armv7h')
 url="https://nixos.org/nix"
 license=('LGPL')
-depends=('gc' 'libsodium' 'boost' 'brotli' 'readline')
+depends=('gc' 'libsodium' 'boost' 'brotli' 'editline' 'dash-static')
 makedepends=('bzip2' 'gc' 'openssl')
 install=nix.install
 source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz")
@@ -26,11 +26,10 @@ prepare() {
 
 build () {
   cd "$pkgname-$pkgver"
-  export EDITLINE_CFLAGS="-DREADLINE"
-  export EDITLINE_LIBS="/usr/lib/libreadline.so"
   ./configure --prefix=/usr \
               --libexecdir="/usr/lib/$pkgname" \
               --sysconfdir=/etc \
+              --with-sandbox-shell=/usr/bin/dash-static \
               --enable-gc
   make
 }