diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-06-07 18:41:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-06-07 18:41:20 +0200 |
| commit | 186571965dccf57d15b9f37c1cca92a57187b7b3 (patch) | |
| tree | 79c38bc54d9a3e2bbd296a094ca988c13088fb09 /src/nix | |
| parent | aa952d5f0bc623a1584f2d589209f586e594c75f (diff) | |
Don't show flags from config settings in "nix --help"
Diffstat (limited to 'src/nix')
| -rw-r--r-- | src/nix/main.cc | 4 | ||||
| -rw-r--r-- | src/nix/sigs.cc | 9 | ||||
| -rw-r--r-- | src/nix/verify.cc | 9 |
3 files changed, 17 insertions, 5 deletions
diff --git a/src/nix/main.cc b/src/nix/main.cc index ea6838cd7..88a602b84 100644 --- a/src/nix/main.cc +++ b/src/nix/main.cc @@ -33,7 +33,9 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs mkFlag(0, "version", "show version information", std::bind(printVersion, programName)); - settings.convertToArgs(*this); + std::string cat = "config"; + settings.convertToArgs(*this, cat); + hiddenCategories.insert(cat); } void printFlags(std::ostream & out) override diff --git a/src/nix/sigs.cc b/src/nix/sigs.cc index 3dd037716..0e3eb9b69 100644 --- a/src/nix/sigs.cc +++ b/src/nix/sigs.cc @@ -13,8 +13,13 @@ struct CmdCopySigs : StorePathsCommand CmdCopySigs() { - mkFlag('s', "substituter", {"store-uri"}, "use signatures from specified store", 1, - [&](Strings ss) { substituterUris.push_back(ss.front()); }); + mkFlag() + .longName("substituter") + .shortName('s') + .labels({"store-uri"}) + .description("use signatures from specified store") + .arity(1) + .handler([&](Strings ss) { substituterUris.push_back(ss.front()); }); } std::string name() override diff --git a/src/nix/verify.cc b/src/nix/verify.cc index 8facb4bef..18533e606 100644 --- a/src/nix/verify.cc +++ b/src/nix/verify.cc @@ -19,8 +19,13 @@ struct CmdVerify : StorePathsCommand { mkFlag(0, "no-contents", "do not verify the contents of each store path", &noContents); mkFlag(0, "no-trust", "do not verify whether each store path is trusted", &noTrust); - mkFlag('s', "substituter", {"store-uri"}, "use signatures from specified store", 1, - [&](Strings ss) { substituterUris.push_back(ss.front()); }); + mkFlag() + .longName("substituter") + .shortName('s') + .labels({"store-uri"}) + .description("use signatures from specified store") + .arity(1) + .handler([&](Strings ss) { substituterUris.push_back(ss.front()); }); mkIntFlag('n', "sigs-needed", "require that each path has at least N valid signatures", &sigsNeeded); } |