Re: [PR PATCH] [Updated] nix: update to 2.8.0.

[faulesocke <faulesocke@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]

There is an updated pull request by faulesocke against master on the void-packages repository

https://github.com/faulesocke/void-packages nix
https://github.com/void-linux/void-packages/pull/37040

nix: update to 2.8.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)



A patch file from https://github.com/void-linux/void-packages/pull/37040.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nix-37040.patch --]
[-- Type: text/x-diff, Size: 5358 bytes --]

From 4fb3522f0e261a0d19983d7e195f5983cf96978a Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Wed, 16 Feb 2022 16:58:21 +0100
Subject: [PATCH 1/3] lowdown: update to 0.11.2.

---
 common/shlibs            | 1 +
 srcpkgs/lowdown/template | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 784375c7c9aa..7befa59fd6f8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4169,3 +4169,4 @@ libMatrix.so root-6.24.06_1
 libThread.so root-6.24.06_1
 libTMVA.so root-6.24.06_1
 libMathCore.so root-6.24.06_1
+liblowdown.so lowdown-0.11.2_1
diff --git a/srcpkgs/lowdown/template b/srcpkgs/lowdown/template
index c76c46601e44..930de8c5d2ea 100644
--- a/srcpkgs/lowdown/template
+++ b/srcpkgs/lowdown/template
@@ -1,9 +1,10 @@
 # Template file for 'lowdown'
 pkgname=lowdown
-version=0.9.2
+version=0.11.2
 revision=1
 build_style=configure
 configure_args="PREFIX=/usr MANDIR=/usr/share/man"
+make_install_target="install install_shared install_static"
 make_check_target="regress"
 hostmakedepends="which"
 short_desc="Simple markdown translator"
@@ -12,7 +13,11 @@ license="ISC"
 homepage="https://kristaps.bsd.lv/lowdown/"
 changelog="https://kristaps.bsd.lv/lowdown/archive.html"
 distfiles="https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"
-checksum=5c355d1db2071916b1ad6e789208de664be3781bd17dd8b6b09b1707a283a988
+checksum=6e5cfec293afc24968c0ddd8deb4f57389adba6a8b7bcb221d34c1a44aeef3eb
+shlib_provides="liblowdown.so"
+
+CFLAGS+=" -fPIE -fPIC"
+LDFLAGS+=" -pie"
 
 post_install() {
 	vlicense LICENSE.md

From 88672d57fba946684b396eb5bfba301ebe3e6036 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 13:57:09 +0200
Subject: [PATCH 2/3] New package: nlohmann-json-3.10.5

---
 srcpkgs/nlohmann-json/template | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 srcpkgs/nlohmann-json/template

diff --git a/srcpkgs/nlohmann-json/template b/srcpkgs/nlohmann-json/template
new file mode 100644
index 000000000000..23a7dfc897a8
--- /dev/null
+++ b/srcpkgs/nlohmann-json/template
@@ -0,0 +1,22 @@
+# Template file for 'nlohmann-json'
+pkgname=nlohmann-json
+version=3.10.5
+revision=1
+wrksrc="json-${version}"
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=None -DJSON_MultipleHeaders=ON"
+short_desc="JSON for Modern C++"
+maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
+license="MIT"
+homepage="https://github.com/nlohmann/json"
+#changelog=""
+distfiles="https://github.com/nlohmann/json/archive/refs/tags/v${version}.tar.gz"
+checksum=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4
+# tests only work in git repository
+make_check=no
+
+
+post_install() {
+	vdoc "README.md"
+	vlicense "LICENSE.MIT"
+}

From 79d9217c60d1f0be1d1c576ae73d8e4e92af0d75 Mon Sep 17 00:00:00 2001
From: Urs Schulz <voidpkgs@ursschulz.de>
Date: Sun, 8 May 2022 14:26:54 +0200
Subject: [PATCH 3/3] nix: update to 2.8.0.

---
 srcpkgs/nix/template | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index 6e481b3760af..e370a27d0cee 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,22 +1,23 @@
 # Template file for 'nix'
 pkgname=nix
-version=2.3.12
+version=2.8.0
 revision=1
 build_style=gnu-configure
 # Use /nix/var as suggested by the official Manual.
 configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook"
 makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
  liblzma-devel openssl-devel libsodium-devel sqlite-devel
- libseccomp-devel editline-devel"
+ libseccomp-devel editline-devel jq-devel libarchive-devel libcpuid-devel
+ gtest-devel lowdown-devel nlohmann-json"
 depends="curl tar xz"
 short_desc="Purely functional package manager"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-2.1-or-later"
 homepage="https://nixos.org/nix/"
 changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
-distfiles="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/${pkgname}-${version}.tar.xz"
-checksum=213a7d49c461079b32361e4d008d248d7f68e34d2cc9347f3a8ff9029f9afb5d
+distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
+checksum=91a7f2bcdde3263927d842f04a345ed77319148c700e2c8be01498724e6808c0
 
 CXXFLAGS="-Wno-deprecated-declarations"
 
@@ -47,13 +48,14 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 fi
 
 pre_configure() {
-	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-		echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk
-		echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk
-		echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk
-	fi
-	sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure
-	echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk
+	./bootstrap.sh
+	#if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
+	#	echo "libexpr_LDFLAGS += -latomic" >> src/libexpr/local.mk
+	#	echo "libutil_LDFLAGS += -latomic" >> src/libutil/local.mk
+	#	echo "libstore_LDFLAGS += -latomic" >> src/libstore/local.mk
+	#fi
+	#sed -i '/^CFLAGS=/d;/^CXXFLAGS=/d' configure
+	#echo "GLOBAL_LDFLAGS += $LDFLAGS" >>mk/lib.mk
 }
 
 post_install() {