picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #9930 from rvl/print-dev-env-unbound-variables 

print-dev-env: Avoid using unbound shellHook variable
This commit is contained in:
Théophane Hufschmitt 2024-02-04 20:55:17 +01:00 committed by GitHub
parent 49cf090cb2 e1131b5927
commit 25385a408e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/nix/develop.cc
View File

@ -354,7 +354,7 @@ struct Common : InstallableCommand, MixProfile
for (auto & i : {"TMP", "TMPDIR", "TEMP", "TEMPDIR"})
out << fmt("export %s=\"$NIX_BUILD_TOP\"\n", i);
out << "eval \"$shellHook\"\n";
out << "eval \"${shellHook:-}\"\n";
auto script = out.str();

4
tests/functional/nix-shell.sh
View File

@ -118,10 +118,10 @@ diff $TEST_ROOT/dev-env{,2}.json
# Ensure `nix print-dev-env --json` contains variable assignments.
[[ $(jq -r .variables.arr1.value[2] $TEST_ROOT/dev-env.json) = '3 4' ]]
# Run tests involving `source <(nix print-dev-inv)` in subshells to avoid modifying the current
# Run tests involving `source <(nix print-dev-env)` in subshells to avoid modifying the current
# environment.
set +u # FIXME: Make print-dev-env `set -u` compliant (issue #7951)
set -u
# Ensure `source <(nix print-dev-env)` modifies the environment.
(