diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-02 19:30:45 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-22 12:54:19 +0200 |
| commit | 432d9f4df4b5bae6a0a138de9cfa615593290b6c (patch) | |
| tree | 38a14e60793c3f95e8cc668ac4572895cf4c61e0 | |
| parent | 9a87de50b4fd2f5b622f43b058575f427d49c72d (diff) | |
gnu: nix: Update to 2.25.5.
* gnu/packages/package-management.scm (nix): Update to 2.25.5.
[inputs]: Replace libgit2 by libgit2-1.9. Add libblake3.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.
Change-Id: I6f585b463899942bf8d6b33be7a37e7036ec0324
| -rw-r--r-- | gnu/packages/package-management.scm | 7 | ||||
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 17 |
2 files changed, 15 insertions, 9 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4e58490265..30af5130cd 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.24.15") + (version "2.25.5") (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 "1xvcj7sws2w8yv3cn58chjjix7rjs63w1m2343v80i3gphf8ayhq")) + (base32 "150678l5bw8d8gaagsqy9fxlrxhvdx3cmphbn6b2l2c7pa3d06pp")) (patches (search-patches "nix-dont-build-html-doc.diff")))) (build-system gnu-build-system) @@ -942,8 +942,9 @@ by using a Xapian cache.") curl editline libarchive + libblake3 libgc - libgit2 + libgit2-1.9 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 58591b84e1..ad5f9c573f 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -5,7 +5,7 @@ Author: Zhu Zihao <all_but_last@163.com> --- a/doc/manual/local.mk +++ b/doc/manual/local.mk -@@ -166,21 +166,6 @@ $(d)/src/SUMMARY-rl-next.md: $(d)/src/release-notes/rl-next.md +@@ -166,21 +166,6 @@ $(d)/source/SUMMARY-rl-next.md: $(d)/source/release-notes/rl-next.md true > $@; \ fi @@ -27,7 +27,7 @@ Author: Zhu Zihao <all_but_last@163.com> # Generate 'nix' manpages. .PHONY: manpages manpages: $(mandir)/man1/nix3-manpages -@@ -206,26 +191,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli +@@ -206,31 +191,3 @@ doc/manual/generated/man1/nix3-manpages: $(d)/source/command-ref/new-cli rm $$tmpFile; \ done @touch $@ @@ -36,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/development/experimental-feature-descriptions.md $(d)/src/command-ref/conf-file.md $(d)/src/language/builtins.md $(d)/src/release-notes/rl-next.md $(d)/src/figures $(d)/src/favicon.png $(d)/src/favicon.svg +-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/anchors.jq $(d)/custom.css $(d)/source/SUMMARY.md $(d)/source/store/types $(d)/source/command-ref/new-cli $(d)/source/development/experimental-feature-descriptions.md $(d)/source/command-ref/conf-file.md $(d)/source/language/builtins.md $(d)/source/release-notes/rl-next.md $(d)/source/figures $(d)/source/favicon.png $(d)/source/favicon.svg - $(trace-gen) \ - tmp="$$(mktemp -d)"; \ - cp -r doc/manual "$$tmp"; \ @@ -44,12 +44,17 @@ Author: Zhu Zihao <all_but_last@163.com> - $(call process-includes,$$file,$$file); \ - done; \ - find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \ -- docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \ +- docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/source)"; \ - sed -i "s,@docroot@,$$docroot,g" "$$file"; \ - done; \ - set -euo pipefail; \ -- RUST_LOG=warn mdbook build "$$tmp/manual" -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \ -- | { grep -Fv "because fragment resolution isn't implemented" || :; }; \ +- ( \ +- cd "$$tmp/manual"; \ +- RUST_LOG=warn \ +- MDBOOK_SUBSTITUTE_SEARCH=$(d)/source \ +- mdbook build -d $(DESTDIR)$(docdir)/manual.tmp 2>&1 \ +- | { grep -Fv "because fragment resolution isn't implemented" || :; } \ +- ); \ - rm -rf "$$tmp/manual" - @rm -rf $(DESTDIR)$(docdir)/manual - @mv $(DESTDIR)$(docdir)/manual.tmp/html $(DESTDIR)$(docdir)/manual |