upgpkg: nix 2.2.2-2

Merge subtree 'nix'

diff --combined nix/.SRCINFO
index d0f6f1508be49f2b0b2067981b04d6fc3d8cdcbf,8a00b07e58bf7b30722cd661b68f233db0a93579..51e50416e59e39f937db2b4b66c46ec255a07d30
--- 1/nix/.SRCINFO
--- 2/.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 faea9dbf4c22588a22bdd9207ab04f953be7ad41,7b68c7a839ebc768335f0bd30813cb7fa52b2186..8005698dfd28d3bfdb20ccc2adf265423e631854
--- 1/nix/PKGBUILD
--- 2/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
  }