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

Rename 'nix dev-shell' to 'nix develop'

Browse source 
Fixes #3648.
This commit is contained in:
Eelco Dolstra 2020-06-04 10:57:40 +02:00
parent 01572c2198
commit 61e3d598b6
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nix/dev-shell.cc → src/nix/develop.cc
View file

@ -110,7 +110,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
auto builder = baseNameOf(drv.builder); auto builder = baseNameOf(drv.builder);
if (builder != "bash") if (builder != "bash")
throw Error("'nix dev-shell' only works on derivations that use 'bash' as their builder"); throw Error("'nix develop' only works on derivations that use 'bash' as their builder");
auto getEnvShPath = store->addTextToStore("get-env.sh", getEnvSh, {}); auto getEnvShPath = store->addTextToStore("get-env.sh", getEnvSh, {});
@ -231,11 +231,11 @@ struct Common : InstallableCommand, MixProfile
} }
}; };
struct CmdDevShell : Common, MixEnvironment struct CmdDevelop : Common, MixEnvironment
{ {
std::vector<std::string> command; std::vector<std::string> command;
CmdDevShell() CmdDevelop()
{ {
addFlag({ addFlag({
.longName = "command", .longName = "command",
@ -259,15 +259,15 @@ struct CmdDevShell : Common, MixEnvironment
return { return {
Example{ Example{
"To get the build environment of GNU hello:", "To get the build environment of GNU hello:",
"nix dev-shell nixpkgs.hello" "nix develop nixpkgs.hello"
}, },
Example{ Example{
"To store the build environment in a profile:", "To store the build environment in a profile:",
"nix dev-shell --profile /tmp/my-shell nixpkgs.hello" "nix develop --profile /tmp/my-shell nixpkgs.hello"
}, },
Example{ Example{
"To use a build environment previously recorded in a profile:", "To use a build environment previously recorded in a profile:",
"nix dev-shell /tmp/my-shell" "nix develop /tmp/my-shell"
}, },
}; };
} }
@ -341,4 +341,4 @@ struct CmdPrintDevEnv : Common
}; };
static auto r1 = registerCommand<CmdPrintDevEnv>("print-dev-env"); static auto r1 = registerCommand<CmdPrintDevEnv>("print-dev-env");
static auto r2 = registerCommand<CmdDevShell>("dev-shell"); static auto r2 = registerCommand<CmdDevelop>("develop");

2
src/nix/local.mk
View file

@ -28,4 +28,4 @@ $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh
src/nix/dev-shell.cc: src/nix/get-env.sh.gen.hh src/nix/develop.cc: src/nix/get-env.sh.gen.hh