diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-07-02 18:58:13 +0200 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-22 12:51:42 +0200 |
| commit | 142c7df1d01223346e9c94893d33d69ec986fb11 (patch) | |
| tree | 7493a18ce06bf84b3879d930058af6804763b0ec /gnu/packages/patches/nix-dont-build-html-doc.diff | |
| parent | ea94ceba25c5265419897c40227782a883d398df (diff) | |
gnu: nix: Update to 2.19.7.
This one doesn't compile with gcc@11 because of a compiler bug:
checking that GCC bug 80431 is fixed... no
configure: error: Cannot build Nix with C++ compiler with this bug
* gnu/packages/package-management.scm (nix): Update to 2.19.7.
[arguments]{test-target}: Set it to run a subset of tests.
{phases}: Run 'check phase after 'install phase. Add a
'skip-failing-tests phase.
[native-inputs]: Add man-db, util-linux.
* gnu/packages/patches/nix-dont-build-html-doc.diff: Update accordingly.
Change-Id: I14e07ec7fce1b66d473ff084bf3dfc48d2e9284e
Diffstat (limited to 'gnu/packages/patches/nix-dont-build-html-doc.diff')
| -rw-r--r-- | gnu/packages/patches/nix-dont-build-html-doc.diff | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gnu/packages/patches/nix-dont-build-html-doc.diff b/gnu/packages/patches/nix-dont-build-html-doc.diff index cab06b9692..73fa5653f3 100644 --- a/gnu/packages/patches/nix-dont-build-html-doc.diff +++ b/gnu/packages/patches/nix-dont-build-html-doc.diff @@ -6,7 +6,7 @@ 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) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-language > $@.tmp + $(trace-gen) $(dummy-env) $(bindir)/nix __dump-language > $@.tmp @mv $@.tmp $@ -# Generate the HTML manual. @@ -17,18 +17,22 @@ Author: Zhu Zihao <all_but_last@163.com> # Generate 'nix' manpages. install: $(mandir)/man1/nix3-manpages man: doc/manual/generated/man1/nix3-manpages -@@ -173,23 +168,4 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli +@@ -173,27 +168,4 @@ doc/manual/generated/man1/nix3-manpages: $(d)/src/command-ref/new-cli done @touch $@ --$(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 +-# 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 - $(trace-gen) \ - tmp="$$(mktemp -d)"; \ - cp -r doc/manual "$$tmp"; \ - find "$$tmp" -name '*.md' | while read -r file; do \ - $(call process-includes,$$file,$$file); \ - done; \ -- find "$$tmp" -name '*.md' | while read -r file; do \ +- find "$$tmp" -name '*.md' ! -name 'documentation.md' | while read -r file; do \ - docroot="$$(realpath --relative-to="$$(dirname "$$file")" $$tmp/manual/src)"; \ - sed -i "s,@docroot@,$$docroot,g" "$$file"; \ - done; \ |