wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-12 19:05:08 +02:00
Code Activity

Merge remote-tracking branch 'detsys-priv/detsys-main' into sync-2.24.2

Browse source
This commit is contained in:
Eelco Dolstra 2024-08-08 16:57:22 +02:00
commit 27a36255bf
37 changed files with 41 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/local.mk
View file

@ -35,7 +35,7 @@ dummy-env = env -i \
NIX_STATE_DIR=/dummy \
NIX_CONFIG='cores = 0'
nix-eval = $(dummy-env) $(doc_nix) eval --experimental-features nix-command -I nix=doc/manual --store dummy:// --impure --raw
nix-eval = $(dummy-env) $(doc_nix) eval -I nix=doc/manual --store dummy:// --impure --raw
# re-implement mdBook's include directive to make it usable for terminal output and for proper @docroot@ substitution
define process-includes
@ -121,7 +121,7 @@ $(d)/nix.json: $(doc_nix)
@mv $@.tmp $@
$(d)/conf-file.json: $(doc_nix)
$(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
$(trace-gen) $(dummy-env) $(doc_nix) config show --json > $@.tmp
@mv $@.tmp $@
$(d)/src/development/experimental-feature-descriptions.md: $(d)/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)