wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 22:11:15 +02:00
Code Activity

Split nix-env and nix-store documentation per-subcommand

Browse source 
Documentation on "classic" commands with many sub-commands are
notoriously hard to discover due to lack of overview and anchor links.
Additionally the information on common options and environment variables
is not accessible offline in man pages, and therefore often overlooked
by readers.

With this change, each sub-command of nix-store and nix-env gets its
own page in the manual (listed in the table of contents), and each own
man page.

Also, man pages for each subcommand now (again) list common options
and environment variables. While this makes each page quite long and
some common parameters don't apply, this should still make it easier
to navigate as that additional information was not accessible on the
command line at all.

It is now possible to run 'nix-store --<subcommand> --help` to display
help pages for the given subcommand.

Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
This commit is contained in:
Alexander Bantyev 2023-03-23 19:27:41 +04:00 • committed by Valentin Gagarin
parent 84c2c09ec2
commit 36b059748d
52 changed files with 2171 additions and 1715 deletions
Download patch file Download diff file Expand all files Collapse all files

49
src/nix-env/nix-env.cc
View file

@ -1387,6 +1387,8 @@ static int main_nix_env(int argc, char * * argv)
{
Strings opFlags, opArgs;
Operation op = 0;
std::string opName;
bool showHelp = false;
RepairFlag repair = NoRepair;
std::string file;
@ -1426,37 +1428,59 @@ static int main_nix_env(int argc, char * * argv)
Operation oldOp = op;
if (*arg == "--help")
showManPage("nix-env");
showHelp = true;
else if (*arg == "--version")
op = opVersion;
else if (*arg == "--install" || *arg == "-i")
else if (*arg == "--install" || *arg == "-i") {
op = opInstall;
opName = "-install";
}
else if (*arg == "--force-name") // undocumented flag for nix-install-package
globals.forceName = getArg(*arg, arg, end);
else if (*arg == "--uninstall" || *arg == "-e")
else if (*arg == "--uninstall" || *arg == "-e") {
op = opUninstall;
else if (*arg == "--upgrade" || *arg == "-u")
opName = "-uninstall";
}
else if (*arg == "--upgrade" || *arg == "-u") {
op = opUpgrade;
else if (*arg == "--set-flag")
opName = "-upgrade";
}
else if (*arg == "--set-flag") {
op = opSetFlag;
else if (*arg == "--set")
opName = arg->substr(1);
}
else if (*arg == "--set") {
op = opSet;
else if (*arg == "--query" || *arg == "-q")
opName = arg->substr(1);
}
else if (*arg == "--query" || *arg == "-q") {
op = opQuery;
opName = "-query";
}
else if (*arg == "--profile" || *arg == "-p")
globals.profile = absPath(getArg(*arg, arg, end));
else if (*arg == "--file" || *arg == "-f")
file = getArg(*arg, arg, end);
else if (*arg == "--switch-profile" || *arg == "-S")
else if (*arg == "--switch-profile" || *arg == "-S") {
op = opSwitchProfile;
else if (*arg == "--switch-generation" || *arg == "-G")
opName = "-switch-profile";
}
else if (*arg == "--switch-generation" || *arg == "-G") {
op = opSwitchGeneration;
else if (*arg == "--rollback")
opName = "-switch-generation";
}
else if (*arg == "--rollback") {
op = opRollback;
else if (*arg == "--list-generations")
opName = arg->substr(1);
}
else if (*arg == "--list-generations") {
op = opListGenerations;
else if (*arg == "--delete-generations")
opName = arg->substr(1);
}
else if (*arg == "--delete-generations") {
op = opDeleteGenerations;
opName = arg->substr(1);
}
else if (*arg == "--dry-run") {
printInfo("(dry run; not doing anything)");
globals.dryRun = true;
@ -1485,6 +1509,7 @@ static int main_nix_env(int argc, char * * argv)
myArgs.parseCmdline(argvToStrings(argc, argv));
if (showHelp) showManPage("nix-env" + opName);
if (!op) throw UsageError("no operation specified");
auto store = openStore();