diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-02 19:02:54 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-22 12:52:34 +0200 |
| commit | d72a47ece231bb75c9583e2be493f31b4c9ba7ee (patch) | |
| tree | 6f2a758cee13f2e76f180b562ddcf9e5cf3e389b | |
| parent | 142c7df1d01223346e9c94893d33d69ec986fb11 (diff) | |
gnu: nix: Update to 2.20.9.
The libgc library starts being outdated since this Nix version.
* gnu/packages/package-management.scm (nix): Update to 2.20.9.
[arguments]{phases}: Adapt phase 'skip-failing-tests.
[inputs]: Add libgit2.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.
Change-Id: Ibe1b39b072a34433a350272a3eb3aeb2d9939367
| -rw-r--r-- | gnu/packages/package-management.scm | 8 | ||||
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 19 |
2 files changed, 14 insertions, 13 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 3f14413614..c83902ddde 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.19.7") + (version "2.20.9") (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 "1xrx826i44sn7gxnf5cry9jxhzarflxp3y356wfq8q8ivi4gai0a")) + (base32 "0w1rdgchsrb3xbzs9213kv966cshyp42fhhil0fgqgybnfnjdfvg")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -907,7 +907,8 @@ by using a Xapian cache.") (("export SHELL=\"@bash@\"" all) (string-append all "\nexport shell=\"@bash@\""))) (substitute* "tests/functional/local.mk" - ((" (fmt|nix-profile|plugins|shell|flakes/config)\\.sh") + (("\ + (debugger|fmt|nix-profile|plugins|shell|flakes/config)\\.sh") ""))))))) (native-inputs (list autoconf @@ -930,6 +931,7 @@ by using a Xapian cache.") editline libarchive libgc + libgit2 libseccomp libsodium lowdown diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index 73fa5653f3..d9244ac9ff 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -5,9 +5,9 @@ Author: Zhu Zihao <all_but_last@163.com> --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -144,11 +144,6 @@ $(d)/language.json: $(bindir)/nix - $(trace-gen) $(dummy-env) $(bindir)/nix __dump-language > $@.tmp - @mv $@.tmp $@ +@@ -172,11 +172,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md + true > $@; \ + fi -# Generate the HTML manual. -.PHONY: manual-html @@ -15,17 +15,18 @@ Author: Zhu Zihao <all_but_last@163.com> -install: $(docdir)/manual/index.html - # Generate 'nix' manpages. - install: $(mandir)/man1/nix3-manpages - man: doc/manual/generated/man1/nix3-manpages -@@ -173,27 +168,4 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli + .PHONY: manpages + manpages: $(mandir)/man1/nix3-manpages +@@ -202,26 +197,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli + rm $$tmpFile; \ done @touch $@ - +- -# the `! -name 'contributing.md'` filter excludes the one place where -# `@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/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/favicon.png $(d)/src/favicon.svg +-$(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 - $(trace-gen) \ - tmp="$$(mktemp -d)"; \ - cp -r doc/manual "$$tmp"; \ @@ -43,5 +44,3 @@ Author: Zhu Zihao <all_but_last@163.com> - @rm -rf $(DESTDIR)$(docdir)/manual - @mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual - @rm -rf $(DESTDIR)$(docdir)/manual.tmp -- - endif |