lix-project/lix
20
57
Fork 31
Code Issues 349 Code Review (Gerrit) Projects 3 Releases Wiki Activity

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

Browse source 
(cherry picked from commit 5d8504b978)
This commit is contained in:
Matthew Kenigsberg 2020-04-29 14:02:37 -06:00 committed by Eelco Dolstra
parent 5eebc4ad1d
commit d6b4047c2f
2 changed files with 7 additions and 7 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

14
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,7 +141,7 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
} }
}; };
static auto r1 = registerCommand<CmdRun>("run"); static auto r1 = registerCommand<CmdShell>("shell");
void chrootHelper(int argc, char * * argv) void chrootHelper(int argc, char * * argv)
{ {