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

Merge pull request #4233 from Kha/master

Browse source 
nix develop: Preserve stdin with `-c`
This commit is contained in:
Eelco Dolstra 2020-11-10 10:51:48 +01:00 committed by GitHub
parent 0ed7c957be 3f24a417da
commit 3f680c1dcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/develop.cc
View file

@ -474,9 +474,9 @@ struct CmdDevelop : Common, MixEnvironment
ignoreException(); ignoreException();
} }
// If running a phase, don't want an interactive shell running after // If running a phase or single command, don't want an interactive shell running after
// Ctrl-C, so don't pass --rcfile // Ctrl-C, so don't pass --rcfile
auto args = phase ? Strings{std::string(baseNameOf(shell)), rcFilePath} auto args = phase || !command.empty() ? Strings{std::string(baseNameOf(shell)), rcFilePath}
: Strings{std::string(baseNameOf(shell)), "--rcfile", rcFilePath}; : Strings{std::string(baseNameOf(shell)), "--rcfile", rcFilePath};
restoreAffinity(); restoreAffinity();

6
tests/nix-shell.sh
View file

@ -59,6 +59,12 @@ output=$($TEST_ROOT/shell.shebang.rb abc ruby)
# Test 'nix develop'. # Test 'nix develop'.
nix develop -f shell.nix shellDrv -c bash -c '[[ -n $stdenv ]]' nix develop -f shell.nix shellDrv -c bash -c '[[ -n $stdenv ]]'
# Ensure `nix develop -c` preserves stdin
echo foo | nix develop -f shell.nix shellDrv -c cat | grep -q foo
# Ensure `nix develop -c` actually executes the command if stdout isn't a terminal
nix develop -f shell.nix shellDrv -c echo foo |& grep -q foo
# Test 'nix print-dev-env'. # Test 'nix print-dev-env'.
source <(nix print-dev-env -f shell.nix shellDrv) source <(nix print-dev-env -f shell.nix shellDrv)
[[ -n $stdenv ]] [[ -n $stdenv ]]