Merge pull request #8083 from edolstra/fix-nix-store-rendering

Fix misrendering of 'nix store --help'

2 files changed, 13 insertions, 3 deletions

diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
index 8c7c4d358..bc19d0303 100644
--- a/doc/manual/generate-manpage.nix
+++ b/doc/manual/generate-manpage.nix
@@ -7,6 +7,7 @@ let
 
   showCommand = { command, details, filename, toplevel }:
     let
+
       result = ''
         > **Warning** \
         > This program is **experimental** and its interface is subject to change.
@@ -25,6 +26,7 @@ let
 
         ${maybeOptions}
       '';
+
       showSynopsis = command: args:
         let
           showArgument = arg: "*${arg.label}*" + (if arg ? arity then "" else "...");
@@ -32,6 +34,7 @@ let
         in ''
          `${command}` [*option*...] ${arguments}
         '';
+
       maybeSubcommands = if details ? commands && details.commands != {}
         then ''
            where *subcommand* is one of the following:
@@ -39,26 +42,35 @@ let
            ${subcommands}
          ''
         else "";
+
       subcommands = if length categories > 1
         then listCategories
         else listSubcommands details.commands;
+
       categories = sort (x: y: x.id < y.id) (unique (map (cmd: cmd.category) (attrValues details.commands)));
+
       listCategories = concatStrings (map showCategory categories);
+
       showCategory = cat: ''
         **${toString cat.description}:**
 
         ${listSubcommands (filterAttrs (n: v: v.category == cat) details.commands)}
       '';
+
       listSubcommands = cmds: concatStrings (attrValues (mapAttrs showSubcommand cmds));
+
       showSubcommand = name: subcmd: ''
         * [`${command} ${name}`](./${appendName filename name}.md) - ${subcmd.description}
       '';
+
       maybeDocumentation = if details ? doc then details.doc else "";
+
       maybeOptions = if details.flags == {} then "" else ''
         # Options
 
         ${showOptions details.flags toplevel.flags}
       '';
+
       showOptions = options: commonOptions:
         let
           allOptions = options // commonOptions;
@@ -99,7 +111,7 @@ let
     in [ cmd ] ++ concatMap subcommand (attrNames details.commands or {});
 
   parsedToplevel = builtins.fromJSON toplevel;
-  
+
   manpages = processCommand {
     command = "nix";
     details = parsedToplevel;
diff --git a/src/nix/store-copy-log.cc b/src/nix/store-copy-log.cc
index 1dda8c0b8..a6e8aeff7 100644
--- a/src/nix/store-copy-log.cc
+++ b/src/nix/store-copy-log.cc
@@ -24,8 +24,6 @@ struct CmdCopyLog : virtual CopyCommand, virtual InstallablesCommand
           ;
     }
 
-    Category category() override { return catUtility; }
-
     void run(ref<Store> srcStore, Installables && installables) override
     {
         auto & srcLogStore = require<LogStore>(*srcStore);