[arch-commits] Commit in nix/trunk (PKGBUILD)

[George Rawlinson]

    Date: Tuesday, November 16, 2021 @ 01:41:12
  Author: grawlinson
Revision: 1048605

upgpkg: nix 2.4-1

* New upstream release.
* Add split package for documentation.
* Major refactoring.

Modified:
  nix/trunk/PKGBUILD

----------+
 PKGBUILD |   79 +++++++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 62 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-16 01:30:42 UTC (rev 1048604)
+++ PKGBUILD	2021-11-16 01:41:12 UTC (rev 1048605)
@@ -1,13 +1,20 @@
 # Maintainer: George Rawlinson <grawlinson at archlinux.org>
 
-pkgname=nix
-pkgver=2.3.16
+pkgbase=nix
+pkgname=('nix' 'nix-docs')
+pkgver=2.4
 pkgrel=1
 pkgdesc="A purely functional package manager"
 arch=('x86_64')
 url="https://nixos.org/nix"
 license=('LGPL')
-depends=(
+makedepends=(
+  'autoconf-archive'
+  'jq'
+  'libcpuid'
+  'gtest'
+  'lowdown'
+  'mdbook'
   'boost'
   'brotli'
   'bzip2'
@@ -19,10 +26,8 @@
   'openssl'
   'sqlite'
 )
-backup=("etc/$pkgname/$pkgname.conf")
-install="$pkgname.install"
 source=(
-  "https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz"
+  "$pkgname-$pkgver.tar.gz::https://github.com/NixOS/nix/archive/$pkgver.tar.gz"
   'nix.conf'
   'sysusers.conf'
   'tmpfiles.conf'
@@ -29,17 +34,28 @@
   'user.environment.conf'
   'user.tmpfiles.conf'
 )
-sha256sums=('7ee681b69f05b525492d202c3bedcd9dee1960bb818f62690f6c4493b7c2aabc'
-            'cf3c7a3a24ac0f553b6fd8ba6adb8f1375d8675911af12c4db94918a799f688e'
-            'cf6caa02e0b5224332c5945ba6fa08b1517802898290e6c2eb96046cad9598d8'
-            'f078cb60bdd549e9cb3b9af3dfacd33e1b7f16a7e7c02904f50f08bfc8c0d952'
-            'e45e45394a119a4ef2046a4a39403dda2df2af820c2d116763031c4689fc5717'
-            'c353524861487ef7f7e862bdaaa70e2a3a29e08d2ee31947ebf9e01237c5c50d')
+sha512sums=('8ecbd06883541fa0d8cea84625deb8e468bcb2aa20b411b6f54a55e88013c57e4bae86b784ca37fccd6583fde894f15321b68b502d30d2de480ef0a1801c0703'
+            '46fdd1134626da81f0ec3ada47b69bb803277e8dd379052db5d8606475f5ff7ece63c8ae41b5f8ba6d2174465e1e977212c648a11c853b199e11b2014789a661'
+            '6511badd6e4c71d9b7f6e6a87ea521a9727a5569ecf48dca11ee0d04151adf083453dcf7e05eadd5c28278fd8aee9fe44bbb90067f5fc8067c99c5e9665affd9'
+            '879bc28faf877a560ac67500388d9774ec890391ef08d367a18f98ef17faeef8c7d208e747fed1fd501b07c3a3b2286af436eb1bd137de2d8ea9a9c32b48088a'
+            '5f66bbb07912fb5eb52002558ca5eec49e8b7787787c3fbb3ec7cb9831d29f1f064c392dd68807e98bc3a45fa6be87a5d420f75b7cfd52f68a821616e4cdbe70'
+            'da5b6d449f8e69c9211e6bd97b1ce4c6e398da5a34fea9a8a89a28084489a1549188e52f66ce7536903afeb75e690e764188daac20a16227b66cc14a72b7311a')
+b2sums=('5f9e71f02418f3255a2bf5f272cfa1276ff9cb3659e8cf93f2e73022c823ceaecd937601717550e46a79d1ec70a2fd4c35712a0a7175785af0e77c5d089e9dc0'
+        'e79ceeb12faf7c38a167857ded355a74511c1d98e7fcb1efb589072c16b35f017239e6723bad04e13ed5b16cbebc91923363e36c130bf51d06a66a4d4ef54f6b'
+        'e92b8192bae89f0bc8c62371fbe63b4bfd68352699e5ea6900bf4313fd573322a06cb85074b292a005cbf644a50abbb67694f9458f071b0fd223d220494f6b6c'
+        'bffaabbe8c9efee79c7761e72a189796f35c0a40805b53fe954c10590ab9bfd0a321b45c7050ddf30810e36fa4431768f36f19fdc55085c0396ac5338b88f839'
+        'b644b6313745dca057e265281c318982750e9d55ce9b7705f47832ae66f07006cec97e9cbd79bb918a4c1174c8d20c159f8874d212381596f6fb684cb8ea928d'
+        '57610fc5fa370f9c3df50ab411dfe154b273349b3b321ad01768cacdf371e27603e8446a4e4269ccf4ca6cdb59b4a70fdcac59cda29c47eb7e7224555ec7e2e2')
 
-build () {
+prepare() {
   cd "$pkgname-$pkgver"
-  CXXFLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' \
-    ./configure \
+  sed -i "s:\$(bindir):src/nix:g" doc/manual/local.mk
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./bootstrap.sh
+  ./configure \
     --prefix=/usr \
     --libexecdir="/usr/lib/$pkgname" \
     --sysconfdir=/etc \
@@ -48,7 +64,24 @@
   make
 }
 
-package() {
+package_nix() {
+  depends=(
+    'boost-libs'
+    'brotli'
+    'curl'
+    'editline'
+    'gc'
+    'libarchive'
+    'libcpuid'
+    'lowdown'
+    'libseccomp'
+    'libsodium'
+    'openssl'
+    'sqlite'
+  )
+  backup=("etc/$pkgname/$pkgname.conf")
+  install="$pkgname.install"
+
   # systemd integration
   install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname-daemon.conf"
   install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname-daemon.conf"
@@ -59,12 +92,24 @@
   install -vDm644 nix.conf -t "$pkgdir/etc/$pkgname"
 
   # package
-  cd "$pkgname-$pkgver"
+  cd "$pkgbase-$pkgver"
   make DESTDIR="$pkgdir" install
 
   # remove unused files
   rm -rf "$pkgdir/etc/init"
 
+  # move docs out for nix-docs split-package
+  mv "$pkgdir/usr/share/doc" nix-docs
+
   # license
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+
+package_nix-docs() {
+  arch=('any')
+  pkgdesc+=" (documentation)"
+
+  cd "$pkgbase-$pkgver"
+  install -vd "$pkgdir/usr/share/doc"
+  mv nix-docs/nix "$pkgdir/usr/share/doc"
+}