puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #9478 from tweag/nix-config-check

Browse source 
Rename `nix doctor` to `nix config check`
This commit is contained in:
John Ericson 2023-12-01 10:19:19 -05:00 committed by GitHub
parent dfa219d03b cab41025d8
commit ac4d2e7b85
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/rl-next/nix-config-show.md
View file

@ -3,6 +3,6 @@ issues: #7672
prs: #9477 prs: #9477
description: { description: {
`nix show-config` was renamed to `nix config show` to be more consistent with the rest of the command-line interface. `nix show-config` was renamed to `nix config show`, and `nix doctor` was renamed to `nix config check`, to be more consistent with the rest of the command-line interface.
} }

2
doc/manual/src/contributing/cli-guideline.md
View file

@ -87,7 +87,7 @@ impacted the most by bad user experience.
and [aligning of text](#text-alignment). and [aligning of text](#text-alignment).
- [Autocomplete](#shell-completion) of options. - [Autocomplete](#shell-completion) of options.
Examples of such commands: `nix doctor`, `nix edit`, `nix eval`, ... Examples of such commands: `nix edit`, `nix eval`, ...
- **Utility and scripting commands** - **Utility and scripting commands**

4
src/nix/doctor.cc → src/nix/config-check.cc
View file

@ -38,7 +38,7 @@ void checkInfo(const std::string & msg) {
} }
struct CmdDoctor : StoreCommand struct CmdConfigCheck : StoreCommand
{ {
bool success = true; bool success = true;
@ -152,4 +152,4 @@ struct CmdDoctor : StoreCommand
} }
}; };
static auto rCmdDoctor = registerCommand<CmdDoctor>("doctor"); static auto rCmdConfigCheck = registerCommand2<CmdConfigCheck>({ "config", "check" });

1
src/nix/main.cc
View file

@ -139,6 +139,7 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs, virtual RootArgs
{"to-base32", {"hash", "to-base32"}}, {"to-base32", {"hash", "to-base32"}},
{"to-base64", {"hash", "to-base64"}}, {"to-base64", {"hash", "to-base64"}},
{"verify", {"store", "verify"}}, {"verify", {"store", "verify"}},
{"doctor", {"config", "check"}},
}; };
bool aliasUsed = false; bool aliasUsed = false;