diff options
| author | Linus Heckemann <git@sphalerite.org> | 2018-03-16 22:15:24 +0000 |
|---|---|---|
| committer | Linus Heckemann <git@sphalerite.org> | 2018-03-16 22:15:24 +0000 |
| commit | 12913ccf454c1bc82a51c59872f8185b40c533c5 (patch) | |
| tree | 96f483a67dff776480d2fa5b41846b347c43efa9 /tests | |
| parent | 48662d151bdf4a38670897beacea9d1bd750376a (diff) | |
nix-shell: allow symlinks to .drvs
This makes persistent shell environments easier to use.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/nix-shell.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh index f7cac6ecf..063e97ce2 100644 --- a/tests/nix-shell.sh +++ b/tests/nix-shell.sh @@ -17,6 +17,18 @@ output=$(nix-shell --pure shell.nix -A shellDrv --run \ [[ $(nix-shell --pure $(nix-instantiate shell.nix -A shellDrv) --run \ 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] +# Test nix-shell on a .drv symlink + +# Legacy: absolute path and .drv extension required +nix-instantiate shell.nix -A shellDrv --indirect --add-root shell.drv +[[ $(nix-shell --pure $PWD/shell.drv --run \ + 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] + +# New behaviour: just needs to resolve to a derivation in the store +nix-instantiate shell.nix -A shellDrv --indirect --add-root shell +[[ $(nix-shell --pure shell --run \ + 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] + # Test nix-shell -p output=$(NIX_PATH=nixpkgs=shell.nix nix-shell --pure -p foo bar --run 'echo "$(foo) $(bar)"') [ "$output" = "foo bar" ] |