diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2022-07-05 15:57:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-05 15:57:20 +0200 |
| commit | d63cd77549706431676f3764c619a5f6fb0a2d37 (patch) | |
| tree | 30b6ef6f523822eb19e67ba4c8a2c8d9cd5adc95 /tests | |
| parent | 8a3d34e9741f561758b28d48c9e5864fbefc587f (diff) | |
| parent | e94aa1f6473196f04c339f8661ee4df7b5a0d3be (diff) | |
Merge pull request #6664 from Ma27/innixshell-backwards-compat
nix-shell: restore backwards-compat with old nixpkgs
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ca-shell.nix | 2 | ||||
| -rw-r--r-- | tests/nix-shell.sh | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/ca-shell.nix b/tests/ca-shell.nix index ad2ab6aff..36e1d1526 100644 --- a/tests/ca-shell.nix +++ b/tests/ca-shell.nix @@ -1 +1 @@ -{ ... }@args: import ./shell.nix (args // { contentAddressed = true; }) +{ inNixShell ? false, ... }@args: import ./shell.nix (args // { contentAddressed = true; }) diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh index 3241d7a0f..f291c6f79 100644 --- a/tests/nix-shell.sh +++ b/tests/nix-shell.sh @@ -102,3 +102,11 @@ source <(nix print-dev-env -f "$shellDotNix" shellDrv) [[ ${arr2[1]} = $'\n' ]] [[ ${arr2[2]} = $'x\ny' ]] [[ $(fun) = blabla ]] + +# Test nix-shell with ellipsis and no `inNixShell` argument (for backwards compat with old nixpkgs) +cat >$TEST_ROOT/shell-ellipsis.nix <<EOF +{ system ? "x86_64-linux", ... }@args: +assert (!(args ? inNixShell)); +(import $shellDotNix { }).shellDrv +EOF +nix-shell $TEST_ROOT/shell-ellipsis.nix --run "true" |