Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bf81b3155998
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5449ff7d8aaa
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 7, 2020

  1. nix run using $SHELL as default command

    @Ninlives
    Ninlives committed Apr 7, 2020
    Copy the full SHA
    9d04b5d View commit details

Commits on Apr 8, 2020

  1. Merge pull request #3477 from Ninlives/nix-run-using-env 

    `nix run` using $SHELL as default command
    @edolstra
    edolstra authored Apr 8, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    erictapen Kerstin
    GPG key ID: 5F24E3BD56617EB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5449ff7 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/nix/run.cc
4 changes: 2 additions & 2 deletions src/nix/run.cc
View file
Original file line number Diff line number Diff line change
@@ -59,14 +59,14 @@ struct RunCommon : virtual Command

struct CmdRun : InstallablesCommand, RunCommon, MixEnvironment
{
std::vector<std::string> command = { "bash" };
std::vector<std::string> command = { getEnv("SHELL").value_or("bash") };

CmdRun()
{
mkFlag()
.longName("command")
.shortName('c')
.description("command and arguments to be executed; defaults to 'bash'")
.description("command and arguments to be executed; defaults to '$SHELL'")
.labels({"command", "args"})
.arity(ArityAny)
.handler([&](std::vector<std::string> ss) {