From 8b49b75071481b6c0670e1bef03605f8965bafe6 Mon Sep 17 00:00:00 2001 From: koral Date: Wed, 17 Jun 2015 10:18:38 +0200 Subject: [PATCH 01/35] Initial import --- .SRCINFO | 19 +++++++++++++++++++ PKGBUILD | 25 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 .SRCINFO create mode 100644 PKGBUILD diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..36eb2bb --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,19 @@ +pkgbase = nix + pkgdesc = A purely functional package manager + pkgver = 1.9 + pkgrel = 1 + url = http://nixos.org/ + arch = i686 + arch = x86_64 + license = LGPL + makedepends = bzip2 + makedepends = gc + makedepends = openssl + depends = perl-www-curl + depends = perl-dbd-sqlite + depends = perl-dbi + source = http://nixos.org/releases/nix/nix-1.9/nix-1.9.tar.xz + sha256sums = 8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1 + +pkgname = nix + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..b6fd6eb --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,25 @@ +# Maintainer: Oozyslug +# Contributor: Anntoin Wilkinson + +pkgname=nix +pkgver=1.9 +pkgrel=1 +pkgdesc="A purely functional package manager" +url="http://nixos.org/" +arch=('i686' 'x86_64') +license=('LGPL') +depends=('perl-www-curl' 'perl-dbd-sqlite' 'perl-dbi') +makedepends=('bzip2' 'gc' 'openssl') +source=(http://nixos.org/releases/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} --sysconfdir=/etc --enable-gc + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install +} From fabbe369f3c5c728f1c497de92c689a2f07e5a96 Mon Sep 17 00:00:00 2001 From: oozyslug Date: Wed, 17 Jun 2015 17:13:38 +0530 Subject: [PATCH 02/35] Edit mail ids to protect against spam --- PKGBUILD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index b6fd6eb..3c55b8d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,6 @@ -# Maintainer: Oozyslug -# Contributor: Anntoin Wilkinson +# Submitter: oozyslug +# Maintainer: Oozyslug +# Contributor: koral pkgname=nix pkgver=1.9 From 517f443057dcef2846be7e1f3574cbde45096e47 Mon Sep 17 00:00:00 2001 From: vlad Date: Sun, 6 Sep 2015 19:55:35 +0300 Subject: [PATCH 03/35] update to 1.10 --- .SRCINFO | 11 ++++++----- PKGBUILD | 30 +++++++++++++++++------------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 36eb2bb..214b903 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.9 + pkgver = 1.10 pkgrel = 1 - url = http://nixos.org/ + url = https://nixos.org/nix arch = i686 arch = x86_64 license = LGPL @@ -11,9 +11,10 @@ pkgbase = nix makedepends = openssl depends = perl-www-curl depends = perl-dbd-sqlite - depends = perl-dbi - source = http://nixos.org/releases/nix/nix-1.9/nix-1.9.tar.xz - sha256sums = 8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1 + depends = gc + depends = libsodium + source = http://nixos.org/releases/nix/nix-1.10/nix-1.10.tar.xz + sha256sums = 5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 3c55b8d..90d47b5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,26 +1,30 @@ -# Submitter: oozyslug -# Maintainer: Oozyslug +# Maintainer: Vlad M. +# Contributor: Mario Rodas +# Contributor: Oozyslug # Contributor: koral pkgname=nix -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="A purely functional package manager" -url="http://nixos.org/" arch=('i686' 'x86_64') +url="https://nixos.org/nix" license=('LGPL') -depends=('perl-www-curl' 'perl-dbd-sqlite' 'perl-dbi') +depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') -source=(http://nixos.org/releases/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('8a47cd7c35dfa628a4acfaef387e7451013c61d250bbcf1f38067a7c73f9f3e1') +source=("http://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") +sha256sums=('5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6') -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --libexecdir=/usr/lib/${pkgname} --sysconfdir=/etc --enable-gc - make +build () { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr \ + --libexecdir="/usr/lib/$pkgname" \ + --sysconfdir=/etc \ + --enable-gc + make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } From b3291f3b117f00a1f36288615bcb9b56663aef9e Mon Sep 17 00:00:00 2001 From: vlad Date: Sat, 23 Jan 2016 00:39:46 +0200 Subject: [PATCH 04/35] update to 1.11.1 --- .SRCINFO | 8 +++++--- PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 214b903..3f54e46 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Fri Jan 22 22:39:28 UTC 2016 pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.10 + pkgver = 1.11.1 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +15,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = http://nixos.org/releases/nix/nix-1.10/nix-1.10.tar.xz - sha256sums = 5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6 + source = http://nixos.org/releases/nix/nix-1.11.1/nix-1.11.1.tar.xz + sha256sums = 21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 90d47b5..ca6a5dc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.10 +pkgver=1.11.1 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("http://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6') +sha256sums=('21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a') build () { cd "$pkgname-$pkgver" From 85460d7f7f05dfc9f10dbcb3358ecf599e68adf8 Mon Sep 17 00:00:00 2001 From: vlad Date: Sun, 14 Feb 2016 19:16:07 +0200 Subject: [PATCH 05/35] update to 1.11.2 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3f54e46..56fae2f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Jan 22 22:39:28 UTC 2016 +# Sun Feb 14 17:15:36 UTC 2016 pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.1 + pkgver = 1.11.2 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -15,8 +15,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = http://nixos.org/releases/nix/nix-1.11.1/nix-1.11.1.tar.xz - sha256sums = 21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a + source = http://nixos.org/releases/nix/nix-1.11.2/nix-1.11.2.tar.xz + sha256sums = fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index ca6a5dc..92a5a63 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.1 +pkgver=1.11.2 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("http://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a') +sha256sums=('fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6') build () { cd "$pkgname-$pkgver" From 79fb438b33538cb7505e527fe1a8cc4787aa3599 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 4 Oct 2016 14:15:17 +0300 Subject: [PATCH 06/35] update to 1.11.4 --- .SRCINFO | 8 +++----- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 56fae2f..c038226 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Sun Feb 14 17:15:36 UTC 2016 pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.2 + pkgver = 1.11.4 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -15,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = http://nixos.org/releases/nix/nix-1.11.2/nix-1.11.2.tar.xz - sha256sums = fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6 + source = http://nixos.org/releases/nix/nix-1.11.4/nix-1.11.4.tar.xz + sha256sums = 937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 92a5a63..eb957c0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.2 +pkgver=1.11.4 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("http://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6') +sha256sums=('937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34') build () { cd "$pkgname-$pkgver" From 3b2187395704a02e806dea2758802bd3514c9ecb Mon Sep 17 00:00:00 2001 From: vlad Date: Thu, 5 Jan 2017 00:18:34 +0200 Subject: [PATCH 07/35] update to 1.11.5 --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c038226..e7e94d6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.4 + pkgver = 1.11.5 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = http://nixos.org/releases/nix/nix-1.11.4/nix-1.11.4.tar.xz - sha256sums = 937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34 + source = https://nixos.org/releases/nix/nix-1.11.5/nix-1.11.5.tar.xz + sha256sums = 272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index eb957c0..0d93a60 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.4 +pkgver=1.11.5 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ url="https://nixos.org/nix" license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') -source=("http://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('937779ed2efaa3dec210250635401980acb99a6fea6d7374fbaea78231b36d34') +source=("https://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") +sha256sums=('272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb') build () { cd "$pkgname-$pkgver" From e64c29f89f750f447dc984e43b4b63f0ff6e3d67 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 23 Jan 2017 01:15:06 +0200 Subject: [PATCH 08/35] update to 1.11.6 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e7e94d6..f113ecc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.5 + pkgver = 1.11.6 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.5/nix-1.11.5.tar.xz - sha256sums = 272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb + source = https://nixos.org/releases/nix/nix-1.11.6/nix-1.11.6.tar.xz + sha256sums = e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 0d93a60..1d51dd1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.5 +pkgver=1.11.6 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("https://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('272361d091c735b0e80627fa23fb7c600957472301dd7e54d237069452f3addb') +sha256sums=('e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3') build () { cd "$pkgname-$pkgver" From 5109ca81e56cffa79b8c959fdf846122d10f8655 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 23 Jan 2017 01:45:06 +0200 Subject: [PATCH 09/35] add LICENSE --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index 1d51dd1..e664351 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -27,4 +27,5 @@ build () { package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } From 0f98d8f2d540b98712309d963b7022e447f32dc0 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 28 Feb 2017 15:40:30 +0200 Subject: [PATCH 10/35] update to 1.11.7 --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f113ecc..97d4fe6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.6 + pkgver = 1.11.7 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.6/nix-1.11.6.tar.xz - sha256sums = e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 + source = https://nixos.org/releases/nix/nix-1.11.7/nix-1.11.7.tar.xz + sha256sums = 1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index e664351..f38e931 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.6 +pkgver=1.11.7 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -12,8 +12,8 @@ url="https://nixos.org/nix" license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') -source=("https://nixos.org/releases/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz") -sha256sums=('e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3') +source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") +sha256sums=('1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d') build () { cd "$pkgname-$pkgver" From 2e706b5800a21f6dbd6ac1864feaa2c6031fca0a Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 21 Mar 2017 16:37:56 +0200 Subject: [PATCH 11/35] update to 0.11.8 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 97d4fe6..c8ce04b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.7 + pkgver = 1.11.8 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.7/nix-1.11.7.tar.xz - sha256sums = 1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d + source = https://nixos.org/releases/nix/nix-1.11.8/nix-1.11.8.tar.xz + sha256sums = 69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index f38e931..d6d4472 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.7 +pkgver=1.11.8 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('1a6fd2a23f5fde614c3937c0d51eff46d28dd30d245a66d34d59b15fd9bb8f2d') +sha256sums=('69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67') build () { cd "$pkgname-$pkgver" From b04d076c796b058eeefa5446f15897c8f6eb46d1 Mon Sep 17 00:00:00 2001 From: vlad Date: Tue, 25 Apr 2017 21:28:36 +0300 Subject: [PATCH 12/35] update to 1.11.9 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c8ce04b..ac09a45 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.8 + pkgver = 1.11.9 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.8/nix-1.11.8.tar.xz - sha256sums = 69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67 + source = https://nixos.org/releases/nix/nix-1.11.9/nix-1.11.9.tar.xz + sha256sums = 0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index d6d4472..17d9577 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.8 +pkgver=1.11.9 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67') +sha256sums=('0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1') build () { cd "$pkgname-$pkgver" From 03310c8419ddb175d27e300b4312484c7f9ddbf6 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 12 Jun 2017 23:18:08 +0300 Subject: [PATCH 13/35] update to 1.11.10 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ac09a45..e47e2cb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.9 + pkgver = 1.11.10 pkgrel = 1 url = https://nixos.org/nix arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.9/nix-1.11.9.tar.xz - sha256sums = 0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 + source = https://nixos.org/releases/nix/nix-1.11.10/nix-1.11.10.tar.xz + sha256sums = b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 17d9577..2a40754 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.9 +pkgver=1.11.10 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1') +sha256sums=('b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467') build () { cd "$pkgname-$pkgver" From 163f3e505c7d550dc91ed7807a3535b8a40c49fb Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 14 Feb 2018 14:19:33 +0100 Subject: [PATCH 14/35] update to 1.11.16 --- .SRCINFO | 9 +++-- PKGBUILD | 13 +++++-- fix_perllibdir.patch | 12 ++++++ nix.install | 91 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 fix_perllibdir.patch create mode 100644 nix.install diff --git a/.SRCINFO b/.SRCINFO index e47e2cb..13e7aed 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,9 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.10 + pkgver = 1.11.16 pkgrel = 1 url = https://nixos.org/nix + install = nix.install arch = i686 arch = x86_64 license = LGPL @@ -13,8 +14,10 @@ pkgbase = nix depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.10/nix-1.11.10.tar.xz - sha256sums = b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 + source = https://nixos.org/releases/nix/nix-1.11.16/nix-1.11.16.tar.xz + source = fix_perllibdir.patch + sha256sums = 0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c + sha256sums = 6d5a79602944b560f9b571c8db4efa1b26d4495e6160c5e18c2efbdd2e611c80 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 2a40754..3189ef8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: koral pkgname=nix -pkgver=1.11.10 +pkgver=1.11.16 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') @@ -12,8 +12,15 @@ url="https://nixos.org/nix" license=('LGPL') depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') -source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467') +install=nix.install +source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" "fix_perllibdir.patch") +sha256sums=('0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c' + '6d5a79602944b560f9b571c8db4efa1b26d4495e6160c5e18c2efbdd2e611c80') + +prepare() { + cd "$pkgname-$pkgver" + patch -Np1 -i "${srcdir}/fix_perllibdir.patch" +} build () { cd "$pkgname-$pkgver" diff --git a/fix_perllibdir.patch b/fix_perllibdir.patch new file mode 100644 index 0000000..2cb718b --- /dev/null +++ b/fix_perllibdir.patch @@ -0,0 +1,12 @@ +diff -ura a/Makefile.config.in b/Makefile.config.in +--- a/Makefile.config.in 1970-01-01 00:00:01.000000000 +0000 ++++ b/Makefile.config.in 2017-09-03 17:04:53.032445157 +0000 +@@ -26,7 +26,7 @@ + mandir = @mandir@ + perl = @perl@ + perlbindings = @perlbindings@ +-perllibdir = @perllibdir@ ++perllibdir = $(shell perl -V:vendorarch|cut -d\' -f2) + pkglibdir = $(libdir)/$(PACKAGE_NAME) + prefix = @prefix@ + storedir = @storedir@ diff --git a/nix.install b/nix.install new file mode 100644 index 0000000..e9adc0c --- /dev/null +++ b/nix.install @@ -0,0 +1,91 @@ + +pre_install () { + # Check that the group and users don't already exist + if [[ -n $(cut -d: -f1 /etc/group | grep -w nixbld) ]]; then + echo "The nixbld group already exists. This install cannot proceed." + exit 1 + fi + + for i in {1..10}; do + if [[ -n $(cut -d: -f1 /etc/passwd | grep -w nixbld$i) ]]; then + echo "The nixbld$i user already exists. This install cannot proceed." + exit 1 + fi + done +} + +create_users () { + # Create a nixbld group. + groupadd -r nixbld + + # Create 10 nixbld{i} users + for i in {1..10}; do + useradd -g nixbld -G nixbld -r -N -M -d /var/empty -s /sbin/nologin nixbld$i + done +} + +delete_users() { + # Remove the users + for i in {1..10}; do + userdel nixbld$i + done + + # Remove the group + groupdel nixbld +} + +create_store() { + # Create nix folders and set permissions + mkdir -p /nix/store + chown root.nixbld /nix/store + chmod 1775 /nix/store + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user +} + +restore_store() { + # Restore folder permissions + chmod 755 /nix/store + chown root.root /nix/store +} + +daemon_info() { + if [ ! -d /nix/var/nix/profiles/per-user/root ]; then + echo "To start the nix daemon, execute one of the following:" + echo + echo " systemctl enable nix-daemon.socket # Sets the daemon to start on next boot" + echo " systemctl enable --now nix-daemon.socket # Starts now and on next boot too" + echo + echo "Also, if this is a new install, you need to start a new login shell or otherwise" + echo + echo " source /etc/profile.d/nix.sh" + echo " source /etc/profile.d/nix-daemon.sh" + echo + echo "Once your environment is set-up, you will need to add some channels. You can see how" + echo "to do that here:" + echo " https://nixos.org/nix/manual/#sec-channels" + fi +} + +post_install() { + create_users + create_store + daemon_info +} + +pre_upgrade() { + systemctl stop nix-daemon.socket + systemctl stop nix-daemon +} + +post_upgrade() { + delete_users + create_users + create_store + daemon_info +} + +pre_remove() { + restore_store + delete_users +} From f9ec4c69328af0341fab4f5abf508433a288d02f Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 23 Feb 2018 14:43:31 +0100 Subject: [PATCH 15/35] update to 2.0 --- .SRCINFO | 10 +++------- PKGBUILD | 14 +++++++------- fix_perllibdir.patch | 12 ------------ nix.install | 36 +++++++++++++++++++++--------------- 4 files changed, 31 insertions(+), 41 deletions(-) delete mode 100644 fix_perllibdir.patch diff --git a/.SRCINFO b/.SRCINFO index 13e7aed..e303f97 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 1.11.16 + pkgver = 2.0 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -10,14 +10,10 @@ pkgbase = nix makedepends = bzip2 makedepends = gc makedepends = openssl - depends = perl-www-curl - depends = perl-dbd-sqlite depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-1.11.16/nix-1.11.16.tar.xz - source = fix_perllibdir.patch - sha256sums = 0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c - sha256sums = 6d5a79602944b560f9b571c8db4efa1b26d4495e6160c5e18c2efbdd2e611c80 + source = https://nixos.org/releases/nix/nix-2.0/nix-2.0.tar.xz + sha256sums = 7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 3189ef8..3eb7557 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,25 +1,25 @@ -# Maintainer: Vlad M. +# Maintainer: Felix Morgner +# Contributor: Vlad M. # Contributor: Mario Rodas # Contributor: Oozyslug # Contributor: koral pkgname=nix -pkgver=1.11.16 +pkgver=2.0 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64') url="https://nixos.org/nix" license=('LGPL') -depends=('perl-www-curl' 'perl-dbd-sqlite' 'gc' 'libsodium') +depends=('gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') install=nix.install -source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" "fix_perllibdir.patch") -sha256sums=('0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c' - '6d5a79602944b560f9b571c8db4efa1b26d4495e6160c5e18c2efbdd2e611c80') +source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") +sha256sums=('7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14') + prepare() { cd "$pkgname-$pkgver" - patch -Np1 -i "${srcdir}/fix_perllibdir.patch" } build () { diff --git a/fix_perllibdir.patch b/fix_perllibdir.patch deleted file mode 100644 index 2cb718b..0000000 --- a/fix_perllibdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ura a/Makefile.config.in b/Makefile.config.in ---- a/Makefile.config.in 1970-01-01 00:00:01.000000000 +0000 -+++ b/Makefile.config.in 2017-09-03 17:04:53.032445157 +0000 -@@ -26,7 +26,7 @@ - mandir = @mandir@ - perl = @perl@ - perlbindings = @perlbindings@ --perllibdir = @perllibdir@ -+perllibdir = $(shell perl -V:vendorarch|cut -d\' -f2) - pkglibdir = $(libdir)/$(PACKAGE_NAME) - prefix = @prefix@ - storedir = @storedir@ diff --git a/nix.install b/nix.install index e9adc0c..613cee6 100644 --- a/nix.install +++ b/nix.install @@ -49,27 +49,33 @@ restore_store() { chown root.root /nix/store } +init_channels() { + # Initialize default nix channel + echo "Initializing default nix channel" + source /etc/profile.d/nix.sh + nix-channel --update +} + daemon_info() { - if [ ! -d /nix/var/nix/profiles/per-user/root ]; then - echo "To start the nix daemon, execute one of the following:" - echo - echo " systemctl enable nix-daemon.socket # Sets the daemon to start on next boot" - echo " systemctl enable --now nix-daemon.socket # Starts now and on next boot too" - echo - echo "Also, if this is a new install, you need to start a new login shell or otherwise" - echo - echo " source /etc/profile.d/nix.sh" - echo " source /etc/profile.d/nix-daemon.sh" - echo - echo "Once your environment is set-up, you will need to add some channels. You can see how" - echo "to do that here:" - echo " https://nixos.org/nix/manual/#sec-channels" - fi + echo "To start the nix daemon, execute one of the following:" + echo + echo " systemctl enable nix-daemon.socket # Sets the daemon to start on next boot" + echo " systemctl enable --now nix-daemon.socket # Starts now and on next boot too" + echo + echo "Also, if this is a new install, you need to start a new login shell or otherwise" + echo + echo " source /etc/profile.d/nix.sh" + echo " source /etc/profile.d/nix-daemon.sh" + echo + echo "Once your environment is set-up, you will need to add some channels. You can see how" + echo "to do that here:" + echo " https://nixos.org/nix/manual/#sec-channels" } post_install() { create_users create_store + init_channels daemon_info } From a224b52d8ca2d294b75b724efb2713bc49f183d8 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Thu, 24 May 2018 22:25:16 +1000 Subject: [PATCH 16/35] update to 2.0.2 --- PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 3eb7557..333c027 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,21 +1,22 @@ -# Maintainer: Felix Morgner +# Maintainer: Alastair Pharo +# Contributor: Felix Morgner # Contributor: Vlad M. # Contributor: Mario Rodas # Contributor: Oozyslug # Contributor: koral pkgname=nix -pkgver=2.0 +pkgver=2.0.2 pkgrel=1 pkgdesc="A purely functional package manager" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" license=('LGPL') depends=('gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14') +sha256sums=('2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435') prepare() { From 95461b2631c2479e99fb11ab87aa8e93a9f866eb Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Thu, 24 May 2018 22:31:56 +1000 Subject: [PATCH 17/35] fixup! update to 2.0.2 --- .SRCINFO | 9 +++++---- PKGBUILD | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e303f97..a7a0ebc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,20 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.0 - pkgrel = 1 + pkgver = 2.0.2 + pkgrel = 2 url = https://nixos.org/nix install = nix.install arch = i686 arch = x86_64 + arch = armv7h license = LGPL makedepends = bzip2 makedepends = gc makedepends = openssl depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-2.0/nix-2.0.tar.xz - sha256sums = 7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14 + source = https://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2.tar.xz + sha256sums = 2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 333c027..c730039 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=nix pkgver=2.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" From ecbce1767d3475f5e3f775962b6e1b148506df67 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Thu, 19 Jul 2018 12:45:07 +1000 Subject: [PATCH 18/35] Update to 2.0.4 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a7a0ebc..de58f47 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.0.2 - pkgrel = 2 + pkgver = 2.0.4 + pkgrel = 1 url = https://nixos.org/nix install = nix.install arch = i686 @@ -13,8 +13,8 @@ pkgbase = nix makedepends = openssl depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2.tar.xz - sha256sums = 2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435 + source = https://nixos.org/releases/nix/nix-2.0.4/nix-2.0.4.tar.xz + sha256sums = 166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index c730039..1fa65b7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: koral pkgname=nix -pkgver=2.0.2 -pkgrel=2 +pkgver=2.0.4 +pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" @@ -16,7 +16,7 @@ depends=('gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('2d2984410f73d759485526e594ce41b9819fafa4676f4f85a93dbdd5352a1435') +sha256sums=('166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b') prepare() { From b17b3ab1d8c6f8ca6bd0c8a22adf69c20851c6b7 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 16 Sep 2018 15:57:34 +1000 Subject: [PATCH 19/35] Update to 2.1.1 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index de58f47..7ffc94c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.0.4 + pkgver = 2.1.1 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -13,8 +13,8 @@ pkgbase = nix makedepends = openssl depends = gc depends = libsodium - source = https://nixos.org/releases/nix/nix-2.0.4/nix-2.0.4.tar.xz - sha256sums = 166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b + source = https://nixos.org/releases/nix/nix-2.1.1/nix-2.1.1.tar.xz + sha256sums = 63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 1fa65b7..d21c19f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,7 +6,7 @@ # Contributor: koral pkgname=nix -pkgver=2.0.4 +pkgver=2.1.1 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -16,7 +16,7 @@ depends=('gc' 'libsodium') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('166540ff7b8bb41449586b67e5fc6ab9e25525f6724b6c6bcbfb0648fbd6496b') +sha256sums=('63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b') prepare() { From 86c819102e3c88103b51252b8d7fcefcbd0f1d1f Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Mon, 17 Sep 2018 13:23:56 +1000 Subject: [PATCH 20/35] Add missing dependencies Credit to Mic92 for picking this up. --- .SRCINFO | 4 +++- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7ffc94c..56d551f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager pkgver = 2.1.1 - pkgrel = 1 + pkgrel = 2 url = https://nixos.org/nix install = nix.install arch = i686 @@ -13,6 +13,8 @@ pkgbase = nix makedepends = openssl depends = gc depends = libsodium + depends = boost + depends = brotli source = https://nixos.org/releases/nix/nix-2.1.1/nix-2.1.1.tar.xz sha256sums = 63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b diff --git a/PKGBUILD b/PKGBUILD index d21c19f..2382fb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,12 +7,12 @@ pkgname=nix pkgver=2.1.1 -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') +depends=('gc' 'libsodium' 'boost' 'brotli') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") From be00bfe3c552d815361085d77657981702897ce5 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 7 Oct 2018 17:59:47 +1100 Subject: [PATCH 21/35] Update to 2.1.3 --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 56d551f..d85bc89 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.1.1 - pkgrel = 2 + pkgver = 2.1.3 + pkgrel = 1 url = https://nixos.org/nix install = nix.install arch = i686 @@ -15,8 +15,8 @@ pkgbase = nix depends = libsodium depends = boost depends = brotli - source = https://nixos.org/releases/nix/nix-2.1.1/nix-2.1.1.tar.xz - sha256sums = 63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b + source = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz + sha256sums = 5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 2382fb2..5716bb8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -6,8 +6,8 @@ # Contributor: koral pkgname=nix -pkgver=2.1.1 -pkgrel=2 +pkgver=2.1.3 +pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" @@ -16,7 +16,7 @@ depends=('gc' 'libsodium' 'boost' 'brotli') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('63b1d49ea678162ada6996e42abb62cbc6e65cfefa4faa5436ae37100504720b') +sha256sums=('5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4') prepare() { From b3d2371e5522299b774c435c5f0166f5e7329ca4 Mon Sep 17 00:00:00 2001 From: Anders Bennehag Date: Sat, 19 Jan 2019 09:55:20 -0500 Subject: [PATCH 22/35] Updates to 2.2.1 and adds readline dependency --- PKGBUILD | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5716bb8..daa8e74 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,19 +4,20 @@ # Contributor: Mario Rodas # Contributor: Oozyslug # Contributor: koral +# Contributor: Anders Bennehag pkgname=nix -pkgver=2.1.3 +pkgver=2.2.1 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') +depends=('gc' 'libsodium' 'boost' 'brotli' 'readline') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4') +sha256sums=('85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515') prepare() { @@ -25,6 +26,8 @@ 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 \ From ed04b08b9b4e7c4b8c882450536895592341edcc Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 20 Jan 2019 18:06:51 +1100 Subject: [PATCH 23/35] Update SRCINFO for 2.2.1 --- .SRCINFO | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d85bc89..45cfdc5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.1.3 + pkgver = 2.2.1 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -15,8 +15,9 @@ pkgbase = nix depends = libsodium depends = boost depends = brotli - source = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz - sha256sums = 5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4 + depends = readline + source = https://nixos.org/releases/nix/nix-2.2.1/nix-2.2.1.tar.xz + sha256sums = 85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515 pkgname = nix From 9fe456c4973729b5d83763dd0a644f830491e740 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Tue, 30 Apr 2019 16:25:35 +1000 Subject: [PATCH 24/35] Update to 2.2.2 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45cfdc5..562a12e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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 @@ -16,8 +16,8 @@ pkgbase = nix depends = boost depends = brotli depends = readline - 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 --git a/PKGBUILD b/PKGBUILD index daa8e74..ac47667 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # 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') @@ -17,7 +17,7 @@ depends=('gc' 'libsodium' 'boost' 'brotli' 'readline') makedepends=('bzip2' 'gc' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('85f8d3518060803e44e51b1a9ada1a39cea904b36a632ba1844043a0b63be515') +sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c') prepare() { From 8d425371679c10323edb4f124e9ad64c9f9e9944 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Mon, 6 May 2019 14:36:16 +1000 Subject: [PATCH 25/35] Add editline dependency Required for nix-repl; see https://aur.archlinux.org/packages/nix/#comment-692643 --- .SRCINFO | 5 ++--- PKGBUILD | 9 +++------ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 562a12e..8a00b07 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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,13 +9,12 @@ pkgbase = nix arch = armv7h license = LGPL makedepends = bzip2 - makedepends = gc makedepends = openssl depends = gc depends = libsodium depends = boost depends = brotli - depends = readline + depends = editline 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 ac47667..7b68c7a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,26 +8,23 @@ 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' 'readline') -makedepends=('bzip2' 'gc' 'openssl') +depends=('gc' 'libsodium' 'boost' 'brotli' 'editline') +makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c') - prepare() { cd "$pkgname-$pkgver" } build () { cd "$pkgname-$pkgver" - export EDITLINE_CFLAGS="-DREADLINE" - export EDITLINE_LIBS="/usr/lib/libreadline.so" ./configure --prefix=/usr \ --libexecdir="/usr/lib/$pkgname" \ --sysconfdir=/etc \ From 26fe114f371dc07d6729303eb4e23ed4290775dd Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Wed, 8 May 2019 00:32:53 +1000 Subject: [PATCH 26/35] Add archlinux-nix dependency --- .SRCINFO | 3 +- PKGBUILD | 4 +- nix.install | 120 ++++++++++++++++------------------------------------ 3 files changed, 40 insertions(+), 87 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8a00b07..e5a5b34 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager pkgver = 2.2.2 - pkgrel = 2 + pkgrel = 3 url = https://nixos.org/nix install = nix.install arch = i686 @@ -15,6 +15,7 @@ pkgbase = nix depends = boost depends = brotli depends = editline + depends = archlinux-nix 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 7b68c7a..3160164 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,12 +8,12 @@ pkgname=nix pkgver=2.2.2 -pkgrel=2 +pkgrel=3 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' 'archlinux-nix') makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") diff --git a/nix.install b/nix.install index 613cee6..551b35f 100644 --- a/nix.install +++ b/nix.install @@ -1,97 +1,49 @@ - -pre_install () { - # Check that the group and users don't already exist - if [[ -n $(cut -d: -f1 /etc/group | grep -w nixbld) ]]; then - echo "The nixbld group already exists. This install cannot proceed." - exit 1 - fi - - for i in {1..10}; do - if [[ -n $(cut -d: -f1 /etc/passwd | grep -w nixbld$i) ]]; then - echo "The nixbld$i user already exists. This install cannot proceed." - exit 1 - fi - done -} - -create_users () { - # Create a nixbld group. - groupadd -r nixbld - - # Create 10 nixbld{i} users - for i in {1..10}; do - useradd -g nixbld -G nixbld -r -N -M -d /var/empty -s /sbin/nologin nixbld$i - done -} - -delete_users() { - # Remove the users - for i in {1..10}; do - userdel nixbld$i - done - - # Remove the group - groupdel nixbld -} - -create_store() { - # Create nix folders and set permissions - mkdir -p /nix/store - chown root.nixbld /nix/store - chmod 1775 /nix/store - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user -} - -restore_store() { - # Restore folder permissions - chmod 755 /nix/store - chown root.root /nix/store -} - -init_channels() { - # Initialize default nix channel - echo "Initializing default nix channel" - source /etc/profile.d/nix.sh - nix-channel --update -} - -daemon_info() { - echo "To start the nix daemon, execute one of the following:" +install_info() { + echo "Nix is installed and configured, and the nix-daemon should be running. To check," + echo "you can run:" echo - echo " systemctl enable nix-daemon.socket # Sets the daemon to start on next boot" - echo " systemctl enable --now nix-daemon.socket # Starts now and on next boot too" + echo " archlinux-nix status" echo - echo "Also, if this is a new install, you need to start a new login shell or otherwise" + echo "Each user's environment is setup on login. Alternatively, you can execute the" + echo "following to avoid having to log back in:" echo - echo " source /etc/profile.d/nix.sh" - echo " source /etc/profile.d/nix-daemon.sh" + echo " source /etc/profile.d/nix{,-daemon}.sh" + echo + echo "For more information on how to use nix, check out Part III of the Nix Manual:" + echo + echo " https://nixos.org/nix/manual/#chap-package-management" + echo +} + +remove_info() { + echo "You may wish to do some clean up:" + echo + echo "1. delete /nix folder" + echo " # rm -r /nix" + echo + echo "2. delete the build users (if any)" + echo " # archlinux-nix delete-build-group" + echo + echo "3. delete the config dir" + echo " # rm -r /etc/nix" + echo + echo "4. uninstall the archlinux-nix tool" + echo " pacman -R archlinux-nix" + echo + echo "5. you may also want to delete nix-related files from users' home dirs" + echo " # rm -r /root/.nix-* /home/*/.nix-*" echo - echo "Once your environment is set-up, you will need to add some channels. You can see how" - echo "to do that here:" - echo " https://nixos.org/nix/manual/#sec-channels" } post_install() { - create_users - create_store - init_channels - daemon_info -} - -pre_upgrade() { - systemctl stop nix-daemon.socket - systemctl stop nix-daemon + archlinux-nix bootstrap + install_info } post_upgrade() { - delete_users - create_users - create_store - daemon_info + archlinux-nix bootstrap } -pre_remove() { - restore_store - delete_users +post_remove() { + remove_info } From 85d7e5b9f8789052cca8812d97cb37f8d635166e Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Tue, 15 Oct 2019 22:12:50 +1100 Subject: [PATCH 27/35] Update to 2.3.1; remove archlinux-nix dep --- .SRCINFO | 10 +++++----- PKGBUILD | 9 +++++---- nix.install | 27 +++++---------------------- 3 files changed, 15 insertions(+), 31 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e5a5b34..17c8f27 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.2.2 - pkgrel = 3 + pkgver = 2.3.1 + pkgrel = 1 url = https://nixos.org/nix install = nix.install arch = i686 @@ -15,9 +15,9 @@ pkgbase = nix depends = boost depends = brotli depends = editline - depends = archlinux-nix - source = https://nixos.org/releases/nix/nix-2.2.2/nix-2.2.2.tar.xz - sha256sums = f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c + optdepends = archlinux-nix: tools to help with setup of Nix + source = https://nixos.org/releases/nix/nix-2.3.1/nix-2.3.1.tar.xz + sha256sums = bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 3160164..fe4657e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,17 +7,18 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.2.2 -pkgrel=3 +pkgver=2.3.1 +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' 'editline' 'archlinux-nix') +depends=('gc' 'libsodium' 'boost' 'brotli' 'editline') +optdepends=('archlinux-nix: tools to help with setup of Nix') makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('f80a1b4f9837a8d33209f0b7769d5038335459ff4303eccf3e9217a9eca8594c') +sha256sums=('bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b') prepare() { cd "$pkgname-$pkgver" diff --git a/nix.install b/nix.install index 551b35f..e07213e 100644 --- a/nix.install +++ b/nix.install @@ -1,13 +1,7 @@ install_info() { - echo "Nix is installed and configured, and the nix-daemon should be running. To check," - echo "you can run:" - echo - echo " archlinux-nix status" - echo - echo "Each user's environment is setup on login. Alternatively, you can execute the" - echo "following to avoid having to log back in:" - echo - echo " source /etc/profile.d/nix{,-daemon}.sh" + echo "Nix is installed but no configuration has been done to make it work." + echo "You may wish to install the archlinux-nix package from AUR to help set" + echo "things up." echo echo "For more information on how to use nix, check out Part III of the Nix Manual:" echo @@ -21,29 +15,18 @@ remove_info() { echo "1. delete /nix folder" echo " # rm -r /nix" echo - echo "2. delete the build users (if any)" - echo " # archlinux-nix delete-build-group" - echo - echo "3. delete the config dir" + echo "2. delete the config dir" echo " # rm -r /etc/nix" echo - echo "4. uninstall the archlinux-nix tool" - echo " pacman -R archlinux-nix" - echo - echo "5. you may also want to delete nix-related files from users' home dirs" + echo "3. you may also want to delete nix-related files from users' home dirs" echo " # rm -r /root/.nix-* /home/*/.nix-*" echo } post_install() { - archlinux-nix bootstrap install_info } -post_upgrade() { - archlinux-nix bootstrap -} - post_remove() { remove_info } From 11138caadf06e3f07d6a385a3e9ce6cd7d00c89d Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Fri, 22 Nov 2019 00:40:15 +1100 Subject: [PATCH 28/35] Add linking patch --- .SRCINFO | 4 +++- PKGBUILD | 11 +++++++---- ldflags.patch | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 ldflags.patch diff --git a/.SRCINFO b/.SRCINFO index 17c8f27..f98709e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager pkgver = 2.3.1 - pkgrel = 1 + pkgrel = 2 url = https://nixos.org/nix install = nix.install arch = i686 @@ -17,7 +17,9 @@ pkgbase = nix depends = editline optdepends = archlinux-nix: tools to help with setup of Nix source = https://nixos.org/releases/nix/nix-2.3.1/nix-2.3.1.tar.xz + source = ldflags.patch sha256sums = bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b + sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index fe4657e..9041f11 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=nix pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" @@ -17,16 +17,19 @@ depends=('gc' 'libsodium' 'boost' 'brotli' 'editline') optdepends=('archlinux-nix: tools to help with setup of Nix') makedepends=('bzip2' 'openssl') install=nix.install -source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz") -sha256sums=('bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b') +source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" + 'ldflags.patch') +sha256sums=('bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b' + '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { cd "$pkgname-$pkgver" + patch --forward --strip=1 --input="${srcdir}/ldflags.patch" } build () { cd "$pkgname-$pkgver" - ./configure --prefix=/usr \ + CXXFLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' ./configure --prefix=/usr \ --libexecdir="/usr/lib/$pkgname" \ --sysconfdir=/etc \ --enable-gc diff --git a/ldflags.patch b/ldflags.patch new file mode 100644 index 0000000..1a2c4e1 --- /dev/null +++ b/ldflags.patch @@ -0,0 +1,24 @@ +diff --git a/mk/libraries.mk b/mk/libraries.mk +index 307e29b9d05..25cb1b81da6 100644 +--- a/mk/libraries.mk ++++ b/mk/libraries.mk +@@ -96,7 +96,9 @@ define build-library + ifneq ($(OS), Darwin) + $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d)) + endif +- $(1)_LDFLAGS_USE += -L$$(_d) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) ++ # -L and -l might conflict with previously-installed libraries. Instead ++ # pass the file directly to the linker. ++ $(1)_LDFLAGS_USE += -Wl,$$(_d)/$$($(1)_NAME).$(SO_EXT) + + $(1)_INSTALL_PATH := $(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) + +@@ -107,7 +109,7 @@ define build-library + $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | $(DESTDIR)$$($(1)_INSTALL_DIR)/ + $$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) + +- $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) -l$$(patsubst lib%,%,$$(strip $$($(1)_NAME))) ++ $(1)_LDFLAGS_USE_INSTALLED += -Wl,$$(DESTDIR)$$($(1)_INSTALL_DIR)/$$($(1)_NAME).$(SO_EXT) + ifneq ($(OS), Darwin) + ifeq ($(SET_RPATH_TO_LIBS), 1) + $(1)_LDFLAGS_USE_INSTALLED += -Wl,-rpath,$$($(1)_INSTALL_DIR) From 89db9744bcc0f3b3d84015c8c4972903943a8680 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Sun, 26 Apr 2020 12:26:58 +1000 Subject: [PATCH 29/35] Update to 2.3.4 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f98709e..e04f4be 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.1 + pkgver = 2.3.4 pkgrel = 2 url = https://nixos.org/nix install = nix.install @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.1/nix-2.3.1.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.4/nix-2.3.4.tar.xz source = ldflags.patch - sha256sums = bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b + sha256sums = 1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 9041f11..7c7699b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.1 +pkgver=2.3.4 pkgrel=2 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('bb6578e9f20eebab6d78469ecc59c450ac54f276e5a86a882015d98fecb1bc7b' +sha256sums=('1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From eaaf1ce1755295870356f05319c8da6fd13e03b8 Mon Sep 17 00:00:00 2001 From: Alastair Pharo Date: Tue, 23 Jun 2020 18:33:56 +1000 Subject: [PATCH 30/35] Update to 2.3.6 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e04f4be..243837d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.4 + pkgver = 2.3.6 pkgrel = 2 url = https://nixos.org/nix install = nix.install @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.4/nix-2.3.4.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.6/nix-2.3.6.tar.xz source = ldflags.patch - sha256sums = 1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d + sha256sums = 05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89 sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 7c7699b..c59e3c1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.4 +pkgver=2.3.6 pkgrel=2 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d' +sha256sums=('05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From 4ef1f15fbc1cc47cec240b297d884ba555ac0857 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Tue, 8 Sep 2020 20:56:37 +0200 Subject: [PATCH 31/35] Update to 2.3.7. --- .SRCINFO | 8 ++++---- PKGBUILD | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 243837d..c9ec36b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.6 - pkgrel = 2 + pkgver = 2.3.7 + pkgrel = 1 url = https://nixos.org/nix install = nix.install arch = i686 @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.6/nix-2.3.6.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.7/nix-2.3.7.tar.xz source = ldflags.patch - sha256sums = 05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89 + sha256sums = dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596 sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index c59e3c1..083c25e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,8 +7,8 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.6 -pkgrel=2 +pkgver=2.3.7 +pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') url="https://nixos.org/nix" @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('05e90529c9dc9f4bf656cbceae61cafdca49935bb79cd291c8f078a095701d89' +sha256sums=('dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From b93c1fab18fc0a9469287d2a764afa9150ffbe31 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Fri, 27 Nov 2020 22:44:06 +0100 Subject: [PATCH 32/35] Update to v2.3.9. --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c9ec36b..ccae6e5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.7 + pkgver = 2.3.9 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.7/nix-2.3.7.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.9/nix-2.3.9.tar.xz source = ldflags.patch - sha256sums = dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596 + sha256sums = 72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 083c25e..31a4e66 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.7 +pkgver=2.3.9 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('dd8f52849414e5a878afe7e797aa4e22bab77c875d9da5a38d5f1bada704e596' +sha256sums=('72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From d332da353c20df8ed1af7f7f1e2dea8bbe57fc56 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Mon, 28 Dec 2020 19:42:36 +0100 Subject: [PATCH 33/35] Update to v2.3.10. --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ccae6e5..0efa6ab 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.9 + pkgver = 2.3.10 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.9/nix-2.3.9.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.10/nix-2.3.10.tar.xz source = ldflags.patch - sha256sums = 72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa + sha256sums = a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 31a4e66..0a36546 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.9 +pkgver=2.3.10 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('72331fdba220517a0ccabcf5c9735703c31674bfb4ef0b64da5d8f715d6022fa' +sha256sums=('a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From 43be965e53467de0e17f254dd2a66e7785e6a224 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Sun, 16 May 2021 11:45:27 +0200 Subject: [PATCH 34/35] Update to v2.3.11. --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0efa6ab..885e090 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.10 + pkgver = 2.3.11 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -16,9 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.10/nix-2.3.10.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.11/nix-2.3.11.tar.xz source = ldflags.patch - sha256sums = a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab + sha256sums = 89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128 sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix diff --git a/PKGBUILD b/PKGBUILD index 0a36546..980652a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.10 +pkgver=2.3.11 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +19,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('a8a85e55de43d017abbf13036edfb58674ca136691582f17080c1cd12787b7ab' +sha256sums=('89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() { From ab776c7602ed83562a45276d17df6bf99b913813 Mon Sep 17 00:00:00 2001 From: Bert Peters Date: Wed, 9 Jun 2021 21:46:11 +0200 Subject: [PATCH 35/35] Update to v2.3.12. --- .SRCINFO | 7 +++---- PKGBUILD | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 885e090..7b8b731 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = nix pkgdesc = A purely functional package manager - pkgver = 2.3.11 + pkgver = 2.3.12 pkgrel = 1 url = https://nixos.org/nix install = nix.install @@ -16,10 +16,9 @@ pkgbase = nix depends = brotli depends = editline optdepends = archlinux-nix: tools to help with setup of Nix - source = https://nixos.org/releases/nix/nix-2.3.11/nix-2.3.11.tar.xz + source = https://nixos.org/releases/nix/nix-2.3.12/nix-2.3.12.tar.xz source = ldflags.patch - sha256sums = 89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128 + sha256sums = 213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d sha256sums = 42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305 pkgname = nix - diff --git a/PKGBUILD b/PKGBUILD index 980652a..d9cb967 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Alastair Pharo +# Co-Maintainer: Bert Peters # Contributor: Felix Morgner # Contributor: Vlad M. # Contributor: Mario Rodas @@ -7,7 +8,7 @@ # Contributor: Anders Bennehag pkgname=nix -pkgver=2.3.11 +pkgver=2.3.12 pkgrel=1 pkgdesc="A purely functional package manager" arch=('i686' 'x86_64' 'armv7h') @@ -19,7 +20,7 @@ makedepends=('bzip2' 'openssl') install=nix.install source=("https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz" 'ldflags.patch') -sha256sums=('89a8d7995305a78b1561e6670bbf1879c791fc4904eb094bc4f180775a61c128' +sha256sums=('213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d' '42350237d98785b30b0ee099405f2f1f7412f8a816162c22bd232ed3dbbe0305') prepare() {