max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 14:06:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'matthewbauer/nix-shell-relative-shebang' into more-nix-shell

Browse source
This commit is contained in:
Robert Hensing 2024-07-07 00:18:03 +02:00
commit 8838f5c746
3 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/manual/rl-next/shebang-relative.md Normal file
View file

@ -0,0 +1,8 @@
synopsis: ensure nix-shell shebang uses relative path
prs: #5088
description: {
`nix-shell` shebangs use the script file's relative location to resolve relative paths to files passed as command line arguments, but expression arguments were still evaluated using the current working directory as a base path.
The new behavior is that evalutations are performed relative to the script.
}

7
src/nix-build/nix-build.cc
View file

@ -334,8 +334,13 @@ static void main_nix_build(int argc, char * * argv)
exprs = {state->parseStdin()}; exprs = {state->parseStdin()};
else else
for (auto i : remainingArgs) { for (auto i : remainingArgs) {
auto baseDir = inShebang && !packages ? absPath(dirOf(script)) : i;
if (fromArgs) if (fromArgs)
exprs.push_back(state->parseExprFromString(std::move(i), state->rootPath("."))); exprs.push_back(state->parseExprFromString(
std::move(i),
inShebang ? lookupFileArg(*state, baseDir) : state->rootPath(".")
));
else { else {
auto absolute = i; auto absolute = i;
try { try {

10
tests/functional/nix-shell.sh
View file

@ -65,6 +65,16 @@ chmod a+rx $TEST_ROOT/shell.shebang.sh
output=$($TEST_ROOT/shell.shebang.sh abc def) output=$($TEST_ROOT/shell.shebang.sh abc def)
[ "$output" = "foo bar abc def" ] [ "$output" = "foo bar abc def" ]
# Test nix-shell shebang mode with an alternate working directory
sed -e "s|@ENV_PROG@|$(type -P env)|" shell.shebang.expr > $TEST_ROOT/shell.shebang.expr
chmod a+rx $TEST_ROOT/shell.shebang.expr
# Should fail due to expressions using relative path
! $TEST_ROOT/shell.shebang.expr bar
cp shell.nix config.nix $TEST_ROOT
# Should succeed
output=$($TEST_ROOT/shell.shebang.expr bar)
[ "$output" = '-e load(ARGV.shift) -- '"$TEST_ROOT"'/shell.shebang.expr bar' ]
# Test nix-shell shebang mode again with metacharacters in the filename. # Test nix-shell shebang mode again with metacharacters in the filename.
# First word of filename is chosen to not match any file in the test root. # First word of filename is chosen to not match any file in the test root.
sed -e "s|@ENV_PROG@|$(type -P env)|" shell.shebang.sh > $TEST_ROOT/spaced\ \\\'\"shell.shebang.sh sed -e "s|@ENV_PROG@|$(type -P env)|" shell.shebang.sh > $TEST_ROOT/spaced\ \\\'\"shell.shebang.sh