qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

rename nix run to nix shell and nix app to nix run

Browse source
This commit is contained in:
Matthew Kenigsberg 2020-04-29 14:02:37 -06:00
parent 9570036146
commit 5d8504b978
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/nix/shell.cc → src/nix/dev-shell.cc
View file

22
src/nix/run.cc
View file

@ -57,11 +57,11 @@ struct RunCommon : virtual Command
} }
}; };
struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment struct CmdShell : InstallablesCommand, RunCommon, MixEnvironment
{ {
std::vector<std::string> command = { getEnv("SHELL").value_or("bash") }; std::vector<std::string> command = { getEnv("SHELL").value_or("bash") };
CmdRun() CmdShell()
{ {
mkFlag() mkFlag()
.longName("command") .longName("command")
@ -85,19 +85,19 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
return { return {
Example{ Example{
"To start a shell providing GNU Hello from NixOS 17.03:", "To start a shell providing GNU Hello from NixOS 17.03:",
"nix run -f channel:nixos-17.03 hello" "nix shell -f channel:nixos-17.03 hello"
}, },
Example{ Example{
"To start a shell providing youtube-dl from your 'nixpkgs' channel:", "To start a shell providing youtube-dl from your 'nixpkgs' channel:",
"nix run nixpkgs#youtube-dl" "nix shell nixpkgs#youtube-dl"
}, },
Example{ Example{
"To run GNU Hello:", "To run GNU Hello:",
"nix run nixpkgs#hello -c hello --greeting 'Hi everybody!'" "nix shell nixpkgs#hello -c hello --greeting 'Hi everybody!'"
}, },
Example{ Example{
"To run GNU Hello in a chroot store:", "To run GNU Hello in a chroot store:",
"nix run --store ~/my-nix nixpkgs#hello -c hello" "nix shell --store ~/my-nix nixpkgs#hello -c hello"
}, },
}; };
} }
@ -141,13 +141,13 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
} }
}; };
static auto r1 = registerCommand<CmdRun>("run"); static auto r1 = registerCommand<CmdShell>("shell");
struct CmdApp : InstallableCommand, RunCommon struct CmdRun : InstallableCommand, RunCommon
{ {
std::vector<std::string> args; std::vector<std::string> args;
CmdApp() CmdRun()
{ {
expectArgs("args", &args); expectArgs("args", &args);
} }
@ -162,7 +162,7 @@ struct CmdApp : InstallableCommand, RunCommon
return { return {
Example{ Example{
"To run Blender:", "To run Blender:",
"nix app blender-bin" "nix run blender-bin"
}, },
}; };
} }
@ -192,7 +192,7 @@ struct CmdApp : InstallableCommand, RunCommon
} }
}; };
static auto r2 = registerCommand<CmdApp>("app"); static auto r2 = registerCommand<CmdRun>("run");
void chrootHelper(int argc, char * * argv) void chrootHelper(int argc, char * * argv)
{ {