aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2024-05-03 22:07:33 +0000
committerGerrit Code Review <gerrit@lix>2024-05-03 22:07:33 +0000
commitf8617f9dc65096ee1e83fe3d100cc252e9f94bf6 (patch)
tree8fa920dfc179b9bb11411aa7fe98b75a5bdfc810 /doc
parent19645a4a6477f964ea4f53d1956e578a1ee15ecb (diff)
parent8458d98b274910e35baceda77f3e573817ed9f41 (diff)
Merge "Rename `nix show-config` to `nix config show`" into main
Diffstat (limited to 'doc')
-rw-r--r--doc/manual/local.mk4
-rw-r--r--doc/manual/meson.build3
-rw-r--r--doc/manual/rl-next/nix-config-show.md7
-rw-r--r--doc/manual/src/SUMMARY.md2
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-config-show.md1
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-config.md1
-rw-r--r--doc/manual/src/command-ref/new-cli/nix3-show-config.md1
7 files changed, 15 insertions, 4 deletions
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 215609f79..50c67b8ae 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -29,7 +29,7 @@ man-pages += $(foreach subcommand, \
clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
# Provide a dummy environment for nix, so that it will not access files outside the macOS sandbox.
-# Set cores to 0 because otherwise nix show-config resolves the cores based on the current machine
+# Set cores to 0 because otherwise nix config show resolves the cores based on the current machine
dummy-env = env -i \
HOME=/dummy \
NIX_CONF_DIR=/dummy \
@@ -89,7 +89,7 @@ doc/manual/generated/in/nix.json: $(doc_nix)
doc/manual/generated/in/conf-file.json: $(doc_nix)
@mkdir -p doc/manual/generated/in
- $(trace-gen) $(dummy-env) $(doc_nix) show-config --json --experimental-features nix-command > $@.tmp
+ $(trace-gen) $(dummy-env) $(doc_nix) config show --json --experimental-features nix-command > $@.tmp
@mv $@.tmp $@
doc/manual/generated/in/contributing/experimental-feature-descriptions.md: doc/manual/generated/in/xp-features.json $(d)/utils.nix $(d)/generate-xp-features.nix $(doc_nix)
diff --git a/doc/manual/meson.build b/doc/manual/meson.build
index cfb6be36f..e253a9bd8 100644
--- a/doc/manual/meson.build
+++ b/doc/manual/meson.build
@@ -197,6 +197,8 @@ endforeach
nix3_manpages = [
'nix3-build',
'nix3-bundle',
+ 'nix3-config',
+ 'nix3-config-show',
'nix3-copy',
'nix3-daemon',
'nix3-derivation-add',
@@ -258,7 +260,6 @@ nix3_manpages = [
'nix3-run',
'nix3-search',
'nix3-shell',
- 'nix3-show-config',
'nix3-store-add-file',
'nix3-store-add-path',
'nix3-store-cat',
diff --git a/doc/manual/rl-next/nix-config-show.md b/doc/manual/rl-next/nix-config-show.md
new file mode 100644
index 000000000..1e7545e73
--- /dev/null
+++ b/doc/manual/rl-next/nix-config-show.md
@@ -0,0 +1,7 @@
+---
+synopsis: rename 'nix show-config' to 'nix config show'
+issues: 7672
+prs: 9477
+---
+
+`nix show-config` was renamed to `nix config show` to be more consistent with the rest of the command-line interface.
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 7747b9061..2437c0dc5 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -91,6 +91,8 @@
- [nix](command-ref/new-cli/nix.md)
- [nix build](command-ref/new-cli/nix3-build.md)
- [nix bundle](command-ref/new-cli/nix3-bundle.md)
+ - [nix config](command-ref/new-cli/nix3-config.md)
+ - [nix config show](command-ref/new-cli/nix3-config-show.md)
- [nix copy](command-ref/new-cli/nix3-copy.md)
- [nix daemon](command-ref/new-cli/nix3-daemon.md)
- [nix derivation](command-ref/new-cli/nix3-derivation.md)
diff --git a/doc/manual/src/command-ref/new-cli/nix3-config-show.md b/doc/manual/src/command-ref/new-cli/nix3-config-show.md
new file mode 100644
index 000000000..a39cd13e9
--- /dev/null
+++ b/doc/manual/src/command-ref/new-cli/nix3-config-show.md
@@ -0,0 +1 @@
+{{#include @generated@/command-ref/new-cli/nix3-config-show.md}}
diff --git a/doc/manual/src/command-ref/new-cli/nix3-config.md b/doc/manual/src/command-ref/new-cli/nix3-config.md
new file mode 100644
index 000000000..ba824c7bc
--- /dev/null
+++ b/doc/manual/src/command-ref/new-cli/nix3-config.md
@@ -0,0 +1 @@
+{{#include @generated@/command-ref/new-cli/nix3-config.md}}
diff --git a/doc/manual/src/command-ref/new-cli/nix3-show-config.md b/doc/manual/src/command-ref/new-cli/nix3-show-config.md
deleted file mode 100644
index 060fc065d..000000000
--- a/doc/manual/src/command-ref/new-cli/nix3-show-config.md
+++ /dev/null
@@ -1 +0,0 @@
-{{#include @generated@/command-ref/new-cli/nix3-show-config.md}}