diff --git a/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch index 6a1807defd6..dc690ffa9c2 100644 --- a/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch +++ b/srcpkgs/nix/patches/0001-manual-build-without-nix-installation.patch @@ -1,19 +1,25 @@ -From b8a68be8b552584f28bd177bbf785fd768828081 Mon Sep 17 00:00:00 2001 -Message-Id: +From 68959b8b92b4bb6fd47cd80aafd9a76c1a50cf37 Mon Sep 17 00:00:00 2001 +Message-Id: <68959b8b92b4bb6fd47cd80aafd9a76c1a50cf37.1662107347.git.congdanhqx@gmail.com> From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 2 Sep 2022 10:33:10 +0700 Subject: [PATCH 1/2] manual: build without nix installation +Current manual needs nix installed into $(bindir) which could be +non-writable if $(prefix) set to root-owned directory like /usr or +/usr/local. In addition, half-baked nix could override the good nix +that installed in $(prefix). + +Let's run $(nix_DIR)/nix instead of $(bindir)/nix. --- doc/manual/local.mk | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/doc/manual/local.mk b/doc/manual/local.mk -index 371ed6f21..ef37d5d6b 100644 +index 66a8cb7de..6fad1c594 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -20,7 +20,7 @@ dummy-env = env -i \ +@@ -24,7 +24,7 @@ dummy-env = env -i \ NIX_STATE_DIR=/dummy \ NIX_CONFIG='cores = 0' @@ -22,7 +28,7 @@ index 371ed6f21..ef37d5d6b 100644 $(d)/%.1: $(d)/src/command-ref/%.md @printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp -@@ -44,31 +44,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli +@@ -48,31 +48,31 @@ $(d)/src/SUMMARY.md: $(d)/src/SUMMARY.md.in $(d)/src/command-ref/new-cli $(trace-gen) cat doc/manual/src/SUMMARY.md.in | while IFS= read line; do if [[ $$line = @manpages@ ]]; then cat doc/manual/src/command-ref/new-cli/SUMMARY.md; else echo "$$line"; fi; done > $@.tmp @mv $@.tmp $@ @@ -49,11 +55,11 @@ index 371ed6f21..ef37d5d6b 100644 + $(trace-gen) $(dummy-env) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp @mv $@.tmp $@ --$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix -+$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix - @cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp +-$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(bindir)/nix ++$(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(nix_DIR)/nix + @cat doc/manual/src/language/builtins-prefix.md > $@.tmp $(trace-gen) $(nix-eval) --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp - @cat doc/manual/src/expressions/builtins-suffix.md >> $@.tmp + @cat doc/manual/src/language/builtins-suffix.md >> $@.tmp @mv $@.tmp $@ -$(d)/builtins.json: $(bindir)/nix @@ -63,7 +69,7 @@ index 371ed6f21..ef37d5d6b 100644 @mv $@.tmp $@ # Generate the HTML manual. -@@ -85,14 +85,14 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages +@@ -89,14 +89,14 @@ $(mandir)/man1/nix3-manpages: doc/manual/generated/man1/nix3-manpages $(trace-install) install -m 0644 $$(dirname $<)/* $(DESTDIR)$$(dirname $@) doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli diff --git a/srcpkgs/nix/patches/0002-manual-cross-build.patch b/srcpkgs/nix/patches/0002-manual-support-cross-compilation-with-qemu.patch similarity index 72% rename from srcpkgs/nix/patches/0002-manual-cross-build.patch rename to srcpkgs/nix/patches/0002-manual-support-cross-compilation-with-qemu.patch index 6bcdd4619e3..6a9e866d1ba 100644 --- a/srcpkgs/nix/patches/0002-manual-cross-build.patch +++ b/srcpkgs/nix/patches/0002-manual-support-cross-compilation-with-qemu.patch @@ -1,21 +1,21 @@ -From 83130b47f14a74387f4ab185d3109ca4523e8f2a Mon Sep 17 00:00:00 2001 -Message-Id: <83130b47f14a74387f4ab185d3109ca4523e8f2a.1662098974.git.congdanhqx@gmail.com> -In-Reply-To: -References: +From 1908b63a6296d24d9b97c6d615b81759812f572e Mon Sep 17 00:00:00 2001 +Message-Id: <1908b63a6296d24d9b97c6d615b81759812f572e.1662107347.git.congdanhqx@gmail.com> +In-Reply-To: <68959b8b92b4bb6fd47cd80aafd9a76c1a50cf37.1662107347.git.congdanhqx@gmail.com> +References: <68959b8b92b4bb6fd47cd80aafd9a76c1a50cf37.1662107347.git.congdanhqx@gmail.com> From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 2 Sep 2022 12:05:18 +0700 -Subject: [PATCH 2/2] manual: cross-build +Subject: [PATCH 2/2] manual: support cross-compilation with qemu --- doc/manual/local.mk | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/doc/manual/local.mk b/doc/manual/local.mk -index ef37d5d6b..cae3b007a 100644 +index 6fad1c594..1e8bd8e47 100644 --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -20,7 +20,13 @@ dummy-env = env -i \ +@@ -24,7 +24,13 @@ dummy-env = env -i \ NIX_STATE_DIR=/dummy \ NIX_CONFIG='cores = 0' @@ -30,7 +30,7 @@ index ef37d5d6b..cae3b007a 100644 $(d)/%.1: $(d)/src/command-ref/%.md @printf "Title: %s\n\n" "$$(basename $@ .1)" > $^.tmp -@@ -54,11 +60,11 @@ $(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix +@@ -58,11 +64,11 @@ $(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix @mv $@.tmp $@ $(d)/nix.json: $(nix_DIR)/nix @@ -43,8 +43,8 @@ index ef37d5d6b..cae3b007a 100644 + $(trace-gen) $(dummy-env) $(_nix-emu) $(nix_DIR)/nix show-config --json --experimental-features nix-command > $@.tmp @mv $@.tmp $@ - $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(nix_DIR)/nix -@@ -68,7 +74,7 @@ $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix + $(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/language/builtins-prefix.md $(nix_DIR)/nix +@@ -72,7 +78,7 @@ $(d)/src/language/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d @mv $@.tmp $@ $(d)/builtins.json: $(nix_DIR)/nix diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template index 6d7724ba7fe..438760836e4 100644 --- a/srcpkgs/nix/template +++ b/srcpkgs/nix/template @@ -1,7 +1,7 @@ # Template file for 'nix' pkgname=nix -version=2.10.3 -revision=3 +version=2.11.0 +revision=1 build_style=gnu-configure build_helper=qemu # Use /nix/var as suggested by the official Manual. @@ -22,7 +22,7 @@ license="LGPL-2.1-or-later" homepage="https://nixos.org/nix/" changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes" distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz" -checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413 +checksum=6a90e144352eaccfab7ef7ed470bad382c4f92d62336b327df99627adba67a7c # disable_parallel_build="build is fine, only linking test" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then