diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-04 02:40:36 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-04 02:40:36 +0000 |
| commit | 25f7ff16fa47a6143a129fb56c9a4ecdb2259a8d (patch) | |
| tree | 03764f681fddc94e532dc7a74608f37a0a698cd2 /src/nix/registry.cc | |
| parent | e12bcabdcbddc228d7af157bb3c2090e324c59a7 (diff) | |
| parent | 8a945d6ddb0676b454458e6fe0e9ea6f8b4b5659 (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-and-ci-static-builds
Diffstat (limited to 'src/nix/registry.cc')
| -rw-r--r-- | src/nix/registry.cc | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/nix/registry.cc b/src/nix/registry.cc index 54ee9152b..afa3503b8 100644 --- a/src/nix/registry.cc +++ b/src/nix/registry.cc @@ -115,7 +115,7 @@ struct CmdRegistryPin : virtual Args, EvalCommand } }; -struct CmdRegistry : virtual MultiCommand, virtual Command +struct CmdRegistry : virtual NixMultiCommand { CmdRegistry() : MultiCommand({ @@ -141,11 +141,6 @@ struct CmdRegistry : virtual MultiCommand, virtual Command command->second->prepare(); command->second->run(); } - - void printHelp(const string & programName, std::ostream & out) override - { - MultiCommand::printHelp(programName, out); - } }; static auto r1 = registerCommand<CmdRegistry>("registry"); |