diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 22:09:04 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-09-03 22:09:04 +0000 |
| commit | 975a47f7fe9365eacd214c196ce5747ea2a19c3b (patch) | |
| tree | 5457a2ba3252a172c8fef1683ca09623bd43b9e2 /tests/nix-shell.sh | |
| parent | 4db0010a9374e357de3db3c0cf1cb1b490a14727 (diff) | |
| parent | e7d93e7ece8fd6906e45d0ea21fa08e00b815ca8 (diff) | |
Merge remote-tracking branch 'obsidian/single-ca-drv-build' into ca-floating-upstream
Diffstat (limited to 'tests/nix-shell.sh')
| -rw-r--r-- | tests/nix-shell.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh index 650904057..1228bb04f 100644 --- a/tests/nix-shell.sh +++ b/tests/nix-shell.sh @@ -27,12 +27,12 @@ output=$(nix-shell --pure --keep SELECTED_IMPURE_VAR shell.nix -A shellDrv --run # Test nix-shell on a .drv symlink # Legacy: absolute path and .drv extension required -nix-instantiate shell.nix -A shellDrv --indirect --add-root $TEST_ROOT/shell.drv +nix-instantiate shell.nix -A shellDrv --add-root $TEST_ROOT/shell.drv [[ $(nix-shell --pure $TEST_ROOT/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 $TEST_ROOT/shell +nix-instantiate shell.nix -A shellDrv --add-root $TEST_ROOT/shell [[ $(nix-shell --pure $TEST_ROOT/shell --run \ 'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]] |