diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-11-05 22:25:08 -0300 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-11-06 12:46:12 -0300 |
| commit | 1e5de83a685ebfffe5b6c433a20c6b8095c8cc29 (patch) | |
| tree | d47136ddddffd24d8226867d6f094a5e99ad4042 /testing/nix | |
| parent | 7cf74e7530c91c4d81256decbda7d428d1b74e4c (diff) | |
| download | aports-1e5de83a685ebfffe5b6c433a20c6b8095c8cc29.tar.bz2 aports-1e5de83a685ebfffe5b6c433a20c6b8095c8cc29.tar.xz | |
testing/nix: upgrade to 2.3.1
Diffstat (limited to 'testing/nix')
| -rw-r--r-- | testing/nix/APKBUILD | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/testing/nix/APKBUILD b/testing/nix/APKBUILD index 4ae4753748..70e7901334 100644 --- a/testing/nix/APKBUILD +++ b/testing/nix/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Jakub Jirutka <jakub@jirutka.cz> pkgname=nix -pkgver=2.1.3 -pkgrel=3 +pkgver=2.3.1 +pkgrel=0 pkgdesc="The purely functional package manager" url="https://nixos.org/nix/" arch="x86 x86_64 aarch64" # supported platforms @@ -22,19 +22,17 @@ makedepends=" sqlite-dev xz xz-dev + editline-dev " pkggroups="nix nixbld" install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-openrc $pkgname-doc" -source="https://nixos.org/releases/nix/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz +source="https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz nix-daemon.initd nix-profile.sh " -builddir="$srcdir/$pkgname-$pkgver" build() { - cd "$builddir" - # NOTE: /nix/var is recommended by upstream and we need /nix anyway. bash ./configure \ --build=$CBUILD \ @@ -48,8 +46,6 @@ build() { } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install cd "$pkgdir" @@ -60,7 +56,8 @@ package() { rm etc/profile.d/* mkdir -p usr/sbin - mv usr/bin/nix-daemon usr/sbin/ + rm -f usr/bin/nix-daemon + ln -s usr/bin/nix usr/sbin/nix-daemon install -m 755 -D "$srcdir"/nix-profile.sh etc/profile.d/nix.sh install -m 755 -D "$srcdir"/nix-daemon.initd etc/init.d/nix-daemon @@ -85,7 +82,8 @@ package() { nix/var/nix/manifests \ nix/var/nix/profiles/default \ nix/var/nix/temproots \ - nix/var/nix/userpool + nix/var/nix/userpool \ + nix/var/nix/profile/per-user/root install -d -m 1777 \ nix/var/nix/profiles/per-user \ nix/var/nix/gcroots/per-user @@ -94,6 +92,6 @@ package() { nix/var/nix/daemon-socket } -sha512sums="d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b nix-2.1.3.tar.xz +sha512sums="791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f nix-2.3.1.tar.xz 9e4568db987fbae5097f7bb086e8ad51742c2d229703104fb7e6f240ffb0ca72e57dc305fb238bcee4ec8002d780007af60f241b1f32b6aa413dd579d9c59e75 nix-daemon.initd 0fb5b9ff2f593dca22251b342494ea0b61380d8f905d85855282d259c112aa2a918d9785aa08f847c693a939ebae9fbefcd4e417ad93283a142e066105cc87b5 nix-profile.sh" |