From: Ismaël Bouya <ismael.bouya@normalesup.org>
Date: Sun, 5 May 2019 12:20:38 +0000 (+0200)
Subject: upgpkg: nix 2.2.2-1
X-Git-Url: https://git.immae.eu/?p=perso%2FImmae%2FConfig%2FAUR.git;a=commitdiff_plain;h=728f5350afb9ea992bfd0344a2044259285bde3f;hp=-c

upgpkg: nix 2.2.2-1

upstream release

Merge subtree 'nix'
---

728f5350afb9ea992bfd0344a2044259285bde3f
diff --combined .SRCINFO
index 1e3af62,562a12e..d0f6f15
--- a/.SRCINFO
+++ b/.SRCINFO
@@@ -1,6 -1,6 +1,6 @@@
  pkgbase = nix
  	pkgdesc = A purely functional package manager
- 	pkgver = 2.2.1
+ 	pkgver = 2.2.2
  	pkgrel = 1
  	url = https://nixos.org/nix
  	install = nix.install
@@@ -15,10 -15,9 +15,10 @@@
  	depends = libsodium
  	depends = boost
  	depends = brotli
 -	depends = readline
 +	depends = editline
 +	depends = dash-static
- 	source = https://nixos.org/releases/nix/nix-2.2.1/nix-2.2.1.tar.xz
- 	sha256sums = 85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515
+ 	source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz
+ 	sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c
  
  pkgname = nix
  
diff --combined PKGBUILD
index a3c9a86,ac47667..faea9db
--- a/PKGBUILD
+++ b/PKGBUILD
@@@ -7,17 -7,17 +7,17 @@@
  # Contributor: Anders Bennehag
  
  pkgname=nix
- pkgver=2.2.1
+ pkgver=2.2.2
  pkgrel=1
  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")
- sha256sums=('85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515')
+ sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c')
  
  
  prepare() {
@@@ -26,10 -26,11 +26,10 @@@
  
  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
  }