movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 19:16:47 +03:00
Code Activity

nixos/nixos-option: Fix references to old name

Browse source
This commit is contained in:
Chuck 2019-09-06 02:50:50 -07:00 • committed by Linus Heckemann
parent 26c45dfec2
commit 74f05df671
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/installer/tools/nixos-option/nixos-option.cc
View file

@ -386,7 +386,7 @@ void printValue(Context *ctx, Out &out, std::variant<Value, Error> maybe_value,
// misleading. These values may or may not actually be "used" in the // misleading. These values may or may not actually be "used" in the
// config. The thing throwing the error message assumes that if anything // config. The thing throwing the error message assumes that if anything
// ever looks at this value, it is a "use" of this value. But here in // ever looks at this value, it is a "use" of this value. But here in
// nixos-options-summary, we are looking at this value only to print it. // nixos-option, we are looking at this value only to print it.
// In order to avoid implying that this undefined value is actually // In order to avoid implying that this undefined value is actually
// referenced, eat the underlying error message and emit "«not defined»". // referenced, eat the underlying error message and emit "«not defined»".
out << "«not defined»"; out << "«not defined»";
@ -534,9 +534,9 @@ int main(int argc, char **argv) {
MyArgs myArgs(nix::baseNameOf(argv[0]), MyArgs myArgs(nix::baseNameOf(argv[0]),
[&](Strings::iterator &arg, const Strings::iterator &end) { [&](Strings::iterator &arg, const Strings::iterator &end) {
if (*arg == "--help") { if (*arg == "--help") {
nix::showManPage("nixos-options-summary"); nix::showManPage("nixos-option");
} else if (*arg == "--version") { } else if (*arg == "--version") {
nix::printVersion("nixos-options-summary"); nix::printVersion("nixos-option");
} else if (*arg == "--all") { } else if (*arg == "--all") {
all = true; all = true;
} else if (*arg == "--path") { } else if (*arg == "--path") {