From d6b4047c2fd8c197bf7a9f0f9a2f1cfb214e2e89 Mon Sep 17 00:00:00 2001
From: Matthew Kenigsberg <matthewkenigsberg@gmail.com>
Date: Wed, 29 Apr 2020 14:02:37 -0600
Subject: [PATCH] rename nix run to nix shell and nix app to nix run
(cherry picked from commit 5d8504b9789ffebabe8226227c4061dd48354177)
---
src/nix/{shell.cc => dev-shell.cc} | 0
src/nix/run.cc | 14 +++++++-------
2 files changed, 7 insertions(+), 7 deletions(-)
rename src/nix/{shell.cc => dev-shell.cc} (100%)
diff --git a/src/nix/shell.cc b/src/nix/dev-shell.cc
similarity index 100%
rename from src/nix/shell.cc
rename to src/nix/dev-shell.cc
diff --git a/src/nix/run.cc b/src/nix/run.cc
index 5334531fd..ebfec36d9 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -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") };
- CmdRun()
+ CmdShell()
{
mkFlag()
.longName("command")
@@ -85,19 +85,19 @@ struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
return {
Example{
"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{
"To start a shell providing youtube-dl from your 'nixpkgs' channel:",
- "nix run nixpkgs.youtube-dl"
+ "nix shell nixpkgs.youtube-dl"
},
Example{
"To run GNU Hello:",
- "nix run nixpkgs.hello -c hello --greeting 'Hi everybody!'"
+ "nix shell nixpkgs.hello -c hello --greeting 'Hi everybody!'"
},
Example{
"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)
{
--
GitLab