diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-02 19:23:39 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-22 12:53:29 +0200 |
| commit | 9ea0d12c880cdd333de968515db54569f0a8aea9 (patch) | |
| tree | 5f829c5b8687f09f00674c0792f9b3ddc23be15e | |
| parent | da7d74ced73446b440e66e97fd0736b04985269a (diff) | |
gnu: nix: Update to 2.22.4.
* gnu/packages/package-management.scm (nix): Update to 2.22.4.
[arguments]{phases}: Adapt phase 'skip-failing-tests.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.
Change-Id: I2f71cfcfd918d03e872671e0d948831c46b55b77
| -rw-r--r-- | gnu/packages/package-management.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 16 |
2 files changed, 27 insertions, 7 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 8be4cb01bf..cf3d3c894a 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -857,7 +857,7 @@ by using a Xapian cache.") (define-public nix (package (name "nix") - (version "2.21.5") + (version "2.22.4") (source (origin (method git-fetch) @@ -866,7 +866,7 @@ by using a Xapian cache.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13bc2ykw19hi4nqs0gz3iz0y773dgrbbv2c72q4q7gd1vsjwpr7z")) + (base32 "06mq99ky3l3cfgghxhmw4kh1cx04abcdj3y8k24fq29yq36cjs15")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -910,9 +910,19 @@ by using a Xapian cache.") (substitute* "tests/functional/common/vars-and-functions.sh.in" (("export SHELL=\"@bash@\"" all) (string-append all "\nexport shell=\"@bash@\""))) + (substitute* "Makefile" + (("tests/functional/git-hashing/local.mk") + "")) (substitute* "tests/functional/local.mk" - (("\ - (debugger|fmt|nix-profile|plugins|shell|flakes/config)\\.sh") + (((string-append " (" (string-join + '("chroot-store" + "debugger" + "fmt" + "nix-profile" + "plugins" + "shell" + "flakes/config") + "|") ")\\.sh")) ""))))))) (native-inputs (list autoconf diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index d9244ac9ff..bf73f15fc2 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -5,19 +5,29 @@ Author: Zhu Zihao <all_but_last@163.com> --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -172,11 +172,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md +@@ -172,21 +172,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md true > $@; \ fi -# Generate the HTML manual. -.PHONY: manual-html -manual-html: $(docdir)/manual/index.html +- +-# Open the built HTML manual in the default browser. +-manual-html-open: $(docdir)/manual/index.html +- @echo " OPEN " $<; \ +- xdg-open $< \ +- || open $< \ +- || { \ +- echo "Could not open the manual in a browser. Please open '$<'" >&2; \ +- false; \ +- } -install: $(docdir)/manual/index.html - # Generate 'nix' manpages. .PHONY: manpages manpages: $(mandir)/man1/nix3-manpages -@@ -202,26 +197,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli +@@ -212,26 +197,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli rm $$tmpFile; \ done @touch $@ @@ -26,7 +36,7 @@ Author: Zhu Zihao <all_but_last@163.com> -# `@docroot@` is to be preserved for documenting the mechanism -# FIXME: maybe contributing guides should live right next to the code -# instead of in the manual --$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md $(d)/src/release-notes/rl-next.md +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/src/SUMMARY.md $(d)/src/store/types $(d)/src/command-ref/new-cli $(d)/src/contributing/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/language/builtin-constants.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg - $(trace-gen) \ - tmp="$$(mktemp -d)"; \ - cp -r doc/manual "$$tmp"; \ |