From a1d27ff6d21ffbb07411d3f2a2ca3034b7c320a2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 21 Feb 2025 19:13:51 +0100 Subject: [PATCH] Include Determinate Nix version number in the manual --- doc/manual/{book.toml => book.toml.in} | 2 +- doc/manual/meson.build | 6 +++++- doc/manual/package.nix | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) rename doc/manual/{book.toml => book.toml.in} (95%) diff --git a/doc/manual/book.toml b/doc/manual/book.toml.in similarity index 95% rename from doc/manual/book.toml rename to doc/manual/book.toml.in index 3b4044fba..13c553f01 100644 --- a/doc/manual/book.toml +++ b/doc/manual/book.toml.in @@ -1,5 +1,5 @@ [book] -title = "Determinate Nix Reference Manual" +title = "Determinate Nix Reference Manual @version@" src = "source" [output.html] diff --git a/doc/manual/meson.build b/doc/manual/meson.build index f0e71458a..c251fadb1 100644 --- a/doc/manual/meson.build +++ b/doc/manual/meson.build @@ -4,6 +4,8 @@ project('nix-manual', license : 'LGPL-2.1-or-later', ) +fs = import('fs') + nix = find_program('nix', native : true) mdbook = find_program('mdbook', native : true) @@ -83,6 +85,7 @@ manual = custom_target( ''' @0@ @INPUT0@ @CURRENT_SOURCE_DIR@ > @DEPFILE@ @0@ @INPUT1@ summary @2@ < @CURRENT_SOURCE_DIR@/source/SUMMARY.md.in > @2@/source/SUMMARY.md + sed -e 's|@version@|@3@|g' < @INPUT2@ > @2@/book.toml rsync -r --include='*.md' @CURRENT_SOURCE_DIR@/ @2@/ (cd @2@; RUST_LOG=warn @1@ build -d @2@ 3>&2 2>&1 1>&3) | { grep -Fv "because fragment resolution isn't implemented" || :; } 3>&2 2>&1 1>&3 rm -rf @2@/manual @@ -92,12 +95,13 @@ manual = custom_target( python.full_path(), mdbook.full_path(), meson.current_build_dir(), + fs.read('../../.version-determinate').strip(), ), ], input : [ generate_manual_deps, 'substitute.py', - 'book.toml', + 'book.toml.in', 'anchors.jq', 'custom.css', nix3_cli_files, diff --git a/doc/manual/package.nix b/doc/manual/package.nix index 8f5d0dfe1..6d93e6f1a 100644 --- a/doc/manual/package.nix +++ b/doc/manual/package.nix @@ -30,6 +30,7 @@ mkMesonDerivation (finalAttrs: { fileset.difference (fileset.unions [ ../../.version + ../../.version-determinate # Too many different types of files to filter for now ../../doc/manual ./.