aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2023-07-20 17:13:07 +0200
committerGitHub <noreply@github.com>2023-07-20 17:13:07 +0200
commitab363cd49408295df468461bc54ae1293310de78 (patch)
tree5288f1914634b9ee165d1ee728474151e7bc7fe9
parent453c4be93cb10b417a7140d9f8b7185f9785b7a6 (diff)
parent0e4f6dfcf7303bfe3c5d8af6863d57b3e70d370a (diff)
Merge pull request #8723 from fricklerhandwerk/doc-constants
revert anchor prefix for builtin constants
-rw-r--r--doc/manual/generate-builtin-constants.nix8
-rw-r--r--src/libexpr/eval.hh2
2 files changed, 6 insertions, 4 deletions
diff --git a/doc/manual/generate-builtin-constants.nix b/doc/manual/generate-builtin-constants.nix
index 3fc1fae42..8af80a02c 100644
--- a/doc/manual/generate-builtin-constants.nix
+++ b/doc/manual/generate-builtin-constants.nix
@@ -10,12 +10,14 @@ let
type' = optionalString (type != null) " (${type})";
impureNotice = optionalString impure-only ''
- Not available in [pure evaluation mode](@docroot@/command-ref/conf-file.md#conf-pure-eval).
+ > **Note**
+ >
+ > Not available in [pure evaluation mode](@docroot@/command-ref/conf-file.md#conf-pure-eval).
'';
in
squash ''
- <dt id="builtin-constants-${name}">
- <a href="#builtin-constants-${name}"><code>${name}</code>${type'}</a>
+ <dt id="builtins-${name}">
+ <a href="#builtins-${name}"><code>${name}</code></a>${type'}
</dt>
<dd>
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 277e77ad5..46fa96d05 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -806,7 +806,7 @@ struct EvalSettings : Config
List of directories to be searched for `<...>` file references
In particular, outside of [pure evaluation mode](#conf-pure-evaluation), this determines the value of
- [`builtins.nixPath`](@docroot@/language/builtin-constants.md#builtin-constants-nixPath).
+ [`builtins.nixPath`](@docroot@/language/builtin-constants.md#builtins-nixPath).
)"};
Setting<bool> restrictEval{