wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Merge pull request #8942 from fricklerhandwerk/option-anchors

Browse source 
always show anchors on setting listings
This commit is contained in:
John Ericson 2023-10-09 11:29:36 -04:00 • committed by GitHub
commit 22513c91dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 159 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/nix/local.mk
View file

@ -31,7 +31,7 @@ src/nix/develop.cc: src/nix/get-env.sh.gen.hh
src/nix-channel/nix-channel.cc: src/nix-channel/unpack-channel.nix.gen.hh
src/nix/main.cc: doc/manual/generate-manpage.nix.gen.hh doc/manual/utils.nix.gen.hh
src/nix/main.cc: doc/manual/generate-manpage.nix.gen.hh doc/manual/utils.nix.gen.hh doc/manual/generate-settings.nix.gen.hh doc/manual/generate-store-info.nix.gen.hh
src/nix/doc/files/%.md: doc/manual/src/command-ref/files/%.md
@mkdir -p $$(dirname $@)

19
src/nix/main.cc
View file

@ -214,11 +214,28 @@ static void showHelp(std::vector<std::string> subcommand, NixArgs & toplevel)
, CanonPath::root),
*vUtils);
auto vSettingsInfo = state.allocValue();
state.cacheFile(
CanonPath("/generate-settings.nix"), CanonPath("/generate-settings.nix"),
state.parseExprFromString(
#include "generate-settings.nix.gen.hh"
, CanonPath::root),
*vSettingsInfo);
auto vStoreInfo = state.allocValue();
state.cacheFile(
CanonPath("/generate-store-info.nix"), CanonPath("/generate-store-info.nix"),
state.parseExprFromString(
#include "generate-store-info.nix.gen.hh"
, CanonPath::root),
*vStoreInfo);
auto vDump = state.allocValue();
vDump->mkString(toplevel.dumpCli());
auto vRes = state.allocValue();
state.callFunction(*vGenerateManpage, *vDump, *vRes, noPos);
state.callFunction(*vGenerateManpage, state.getBuiltin("false"), *vRes, noPos);
state.callFunction(*vRes, *vDump, *vRes, noPos);
auto attr = vRes->attrs->get(state.symbols.create(mdName + ".md"));
if (!attr)