lachrimae/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity
lix/tests
History
Maximilian Bosch 98946e2d9c
nix-shell: restore backwards-compat with old nixpkgs 
Basically an attempt to resume fixing #5543 for a breakage introduced
earlier[1]. Basically, when evaluating an older `nixpkgs` with
`nix-shell` the following error occurs:

    λ ma27 [~] → nix-shell -I nixpkgs=channel:nixos-18.03 -p nix
    error: anonymous function at /nix/store/zakqwc529rb6xcj8pwixjsxscvlx9fbi-source/pkgs/top-level/default.nix:20:1 called with unexpected argument 'inNixShell'

           at /nix/store/zakqwc529rb6xcj8pwixjsxscvlx9fbi-source/pkgs/top-level/impure.nix:82:1:

               81|
               82| import ./. (builtins.removeAttrs args [ "system" "platform" ] // {
                 | ^
               83|   inherit config overlays crossSystem;

This is a problem because one of the main selling points of Nix is that
you can evaluate any old Nix expression and still get the same result
(which also means that it *still evaluates*). In fact we're deprecating,
but not removing a lot of stuff for that reason such as unquoted URLs[2]
or `builtins.toPath`. However this property was essentially thrown away
here.

The change is rather simple: check if `inNixShell` is specified in the
formals of an auto-called function. This means that

    { inNixShell ? false }:
    builtins.trace inNixShell
      (with import <nixpkgs> { }; makeShell { name = "foo"; })

will show `trace: true` while

    args@{ ... }:
    builtins.trace args.inNixShell
      (with import <nixpkgs> { }; makeShell { name = "foo"; })

will throw the following error:

    error: attribute 'inNixShell' missing

This is explicitly needed because the function in
`pkgs/top-level/impure.nix` of e.g. NixOS 18.03 has an ellipsis[3], but
passes the attribute-set on to another lambda with formals that doesn't
have an ellipsis anymore (hence the error from above). This was perhaps
a mistake, but we can't fix it anymore. This also means that there's
AFAICS no proper way to check if the attr-set that's passed to the Nix
code via `EvalState::autoCallFunction` is eventually passed to a lambda
with formals where `inNixShell` is missing.

However, this fix comes with a certain price. Essentially every
`shell.nix` that assumes `inNixShell` to be passed to the formals even
without explicitly specifying it would break with this[4]. However I think
that this is ugly, but preferable:

* Nix 2.3 was declared stable by NixOS up until recently (well, it still
  is as long as 21.11 is alive), so most people might not have even
  noticed that feature.

* We're talking about a way shorter time-span with this change being
  in the wild, so the fallout should be smaller IMHO.

[1] 9d612c393a
[2] https://github.com/NixOS/rfcs/pull/45#issuecomment-488232537
[3] https://github.com/NixOS/nixpkgs/blob/release-18.03/pkgs/top-level/impure.nix#L75
[4] See e.g. the second expression in this commit-message or the changes
    for `tests/ca/nix-shell.sh`.
2022-06-13 23:29:28 +02:00
..
ca nix: Respect meta.outputsToInstall, and use all outputs by default 2022-04-26 17:17:27 +02:00
config add NIX_USER_CONF_FILES 2020-04-14 18:45:06 +02:00
lang Handle EOFs in string literals correctly 2022-05-25 17:58:13 +02:00
plugins replace most Pos objects/ptrs with indexes into a position table 2022-04-21 21:46:06 +02:00
add.sh tests/check.sh: Fix a race 2021-07-07 10:48:47 +02:00
bad.tar.xz Validate tarball components 2019-12-13 19:05:26 +01:00
bash-profile.sh tests: Rename nix-profile.sh -> bash-profile.sh 2022-03-02 11:21:00 +01:00
big-derivation-attr.nix Fix segfault or stack overflow caused by large derivation fields 2022-01-19 15:21:56 +01:00
binary-cache-build-remote.sh Improve documentation and test and requested 2021-01-22 15:58:58 +00:00
binary-cache.sh Add a test for fetchClosure and 'nix store make-content-addressed' 2022-03-24 21:33:33 +01:00
brotli.sh Move 'nix hash-*' and 'nix to-*' to 'nix hash' 2020-12-03 17:55:55 +01:00
build-dry.sh Fix nix build --dry-run with CA derivations 2022-03-17 11:55:19 +01:00
build-hook-ca-fixed.nix tests: grep for string in nix log for remote-builds 2022-03-04 16:58:27 +01:00
build-hook-ca-floating.nix Restore now-working build-remote-content-addressed-fixed test 2021-02-26 16:32:52 +00:00
build-hook.nix tests: grep for string in nix log for remote-builds 2022-03-04 16:58:27 +01:00
build-remote-content-addressed-fixed.sh Restore now-working build-remote-content-addressed-fixed test 2021-02-26 16:32:52 +00:00
build-remote-content-addressed-floating.sh tests: remove 'ca-references' feature 2022-04-21 10:06:39 +02:00
build-remote-input-addressed.sh Test the post-build-hook with remote builders 2020-12-09 10:45:12 +01:00
build-remote.sh tests: Don't create tests/result 2022-05-02 09:38:51 +02:00
build.sh Make sure that nix build works in --impure mode 2022-05-05 14:53:59 +02:00
ca-shell.nix nix-shell: restore backwards-compat with old nixpkgs 2022-06-13 23:29:28 +02:00
case-hack.sh
case.nar
check-refs.nix
check-refs.sh
check-reqs.nix
check-reqs.sh
check.nix defer formals duplicate check for incresed efficiency all round 2022-01-19 17:07:29 +01:00
check.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
common.sh.in tests/lang: Distinguish crashes from expected failures 2022-05-02 15:12:50 +02:00
compression-levels.sh Add compression level for NARs 2021-10-12 02:14:36 -04:00
compute-levels.sh Add x86_64 compute levels as additional system types 2021-02-22 09:11:15 +01:00
config.nix.in Make the CA tests actuall test CA derivations 2021-06-23 17:36:50 +02:00
config.sh Make experimental-features a proper type 2021-10-26 07:02:31 +02:00
db-migration.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
dependencies.builder0.sh Make nix why-depends quieter by default 2022-01-19 14:24:14 +01:00
dependencies.nix Add a simple test for nix why-depends 2022-01-18 16:54:53 +01:00
dependencies.sh tests/binary-cache.sh: Improve incomplete closure test 2020-05-12 13:56:00 +02:00
describe-stores.sh Add a test for nix describe-stores 2020-09-16 13:53:28 +02:00
dummy Add tests/dummy 2021-07-07 11:30:35 +02:00
dump-db.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
eval-store.sh Disable the eval-store test when using the daemon 2021-10-15 14:15:43 +02:00
eval.nix add tests for nix eval and nix-instantiate 2022-03-16 21:01:51 +02:00
eval.sh fix: builtins.toFile adds path to allowedPaths 2022-04-21 16:41:37 -04:00
export-graph.nix
export-graph.sh tests/binary-cache.sh: Improve incomplete closure test 2020-05-12 13:56:00 +02:00
export.sh
failing.nix nix-store --serve: pass on settings.keepFailed from SSH store 2021-08-31 13:11:46 +02:00
fetchClosure.sh tests: Don't create tests/result 2022-05-02 09:38:51 +02:00
fetchGit.sh Test fetchGit with non-'master' remote repo 2022-04-29 18:42:31 -04:00
fetchGitRefs.sh Merge remote-tracking branch 'origin/master' into flakes 2020-06-17 10:26:52 +02:00
fetchGitSubmodules.sh Revert "Merge pull request #4922 from nrdxp/default-submodules" 2021-09-22 17:25:25 +02:00
fetchMercurial.sh Test fetchMercurial with path containing a . segment 2022-04-09 23:39:00 +02:00
fetchPath.sh Don’t create a file in the worktree in the fetchPath test 2022-03-30 11:42:47 +02:00
fetchTree-file.sh Typo 2022-06-02 21:21:10 +02:00
fetchurl.sh fetchTree: Do not re-fetch paths already present 2022-02-28 21:37:49 +01:00
filter-source.nix
filter-source.sh Add test for builtins.path 2020-07-30 16:38:04 -05:00
fixed.builder1.sh
fixed.builder2.sh
fixed.nix build: also throw hash-mismatch errors if buildMode == bmCheck 2021-09-27 15:44:39 +02:00
fixed.sh build: also throw hash-mismatch errors if buildMode == bmCheck 2021-09-27 15:44:39 +02:00
flake-bundler.sh Replace defaultBla.$system with bla.$system.default 2022-02-22 11:47:41 +01:00
flake-local-settings.sh Replace defaultBla.$system with bla.$system.default 2022-02-22 11:47:41 +01:00
flake-searching.sh Replace defaultBla.$system with bla.$system.default 2022-02-22 11:47:41 +01:00
flakes-run.sh Fix compilation, style fixes 2022-04-19 13:41:32 +02:00
flakes.sh tests/flakes.sh: Fix some ignored breakage 2022-06-02 21:19:16 +02:00
fmt.sh Fix 'nix fmt' test 2022-04-19 21:47:13 +02:00
fmt.simple.sh nix-fmt: add command 2022-03-11 10:00:19 -05:00
function-trace.sh Fix function-trace test case 2021-11-04 15:04:04 +01:00
gc-auto.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
gc-concurrent.builder.sh Make the gc-concurrent test more reliable 2020-07-02 16:13:36 +02:00
gc-concurrent.nix Make the gc-concurrent test more reliable 2020-07-02 16:13:36 +02:00
gc-concurrent.sh Make the gc-concurrent test more reliable 2020-07-02 16:13:36 +02:00
gc-concurrent2.builder.sh Make the gc-concurrent test more reliable 2020-07-02 16:13:36 +02:00
gc-non-blocking.sh gc-non-blocking.sh: Don't hang indefinitely if the GC roots server crashes 2021-12-13 19:01:38 +01:00
gc-runtime.nix
gc-runtime.sh tests/*: show when tests are skipped 2021-03-31 08:30:12 +02:00
gc.sh Make nix why-depends quieter by default 2022-01-19 14:24:14 +01:00
github-flakes.nix Fix 22.05 eval warnings 2022-06-07 14:27:10 +02:00
hash-check.nix
hash.sh Move 'nix hash-*' and 'nix to-*' to 'nix hash' 2020-12-03 17:55:55 +01:00
import-derivation.nix
import-derivation.sh
impure-derivations.nix Provide default values for outputHashAlgo and outputHashMode 2022-03-31 16:56:44 +02:00
impure-derivations.sh tests/impure-derivations.sh: Ensure that inputAddressed build fails 2022-03-31 17:38:15 +02:00
init.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
install-darwin.sh docs+test: fix remaining installer downloads without -L (#4006) 2020-09-12 22:08:40 +02:00
lang.sh tests/lang: Distinguish crashes from expected failures 2022-05-02 15:12:50 +02:00
linux-sandbox.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
local-store.sh Fix disabled case in local store test 2021-08-06 12:36:03 -04:00
local.mk fetchTree: Allow fetching plain files 2022-05-19 18:24:49 +02:00
logging.sh Implement regression test for empty logs loaded via nix log 2022-03-24 22:31:52 +01:00
misc.sh Change error position formatting 2021-01-21 11:02:09 +01:00
multiple-outputs.nix Allow selecting derivation outputs using 'installable!outputs' 2022-05-03 13:43:52 +02:00
multiple-outputs.sh tests/multiple-outputs.sh: Assert empty store 2021-10-13 12:12:44 +02:00
nar-access.nix
nar-access.sh Move NAR-related commands to 'nix nar' 2020-12-03 18:09:02 +01:00
nix-build-examples.nix tests: Test #4197 nix-build output order regression 2020-11-13 17:50:04 +01:00
nix-build.sh tests: Test #4197 nix-build output order regression 2020-11-13 17:50:04 +01:00
nix-channel.sh Test the update of multiple channels 2021-12-17 09:17:33 +01:00
nix-copy-closure.nix Fix 22.05 eval warnings 2022-06-07 14:27:10 +02:00
nix-copy-ssh.sh
nix-profile.sh Integrate review changes 2022-05-13 22:02:28 +02:00
nix-shell.sh nix-shell: restore backwards-compat with old nixpkgs 2022-06-13 23:29:28 +02:00
nix_path.sh Don’t require NIX_PATH entries to be valid paths 2022-01-27 16:26:39 +01:00
nss-preload.nix tests/nss-preload: move nix-fetch binding 2022-05-31 12:14:34 -07:00
optimise-store.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
parallel.builder.sh
parallel.nix
parallel.sh
pass-as-file.sh passAsFile: leave out the hash prefix 2020-01-02 23:56:06 +00:00
path.nix Add test for builtins.path 2020-07-30 16:38:04 -05:00
placeholders.sh
plugins.sh Initialize plugins after handling initial command line flags 2021-02-24 08:22:17 -05:00
post-hook.sh Fix passing $OUT_PATHS to the post-build hook 2022-04-28 13:36:01 +02:00
pure-eval.nix
pure-eval.sh Properly return false on builtins.pathExists /someNonAllowedPath 2021-12-23 10:49:33 +01:00
push-to-store.sh Fix passing $OUT_PATHS to the post-build hook 2022-04-28 13:36:01 +02:00
readfile-context.builder.sh Add test for readFile keeping context 2022-01-09 13:42:36 +03:00
readfile-context.nix Add test for readFile keeping context 2022-01-09 13:42:36 +03:00
readfile-context.sh Add test for readFile keeping context 2022-01-09 13:42:36 +03:00
recursive.sh tests: Fix the recursive test with the daemon 2021-09-13 14:29:42 +02:00
referrers.sh Revert "Fix referrers test" 2021-10-15 16:58:21 +02:00
remote-builds.nix Fix 22.05 eval warnings 2022-06-07 14:27:10 +02:00
remote-store.sh Add a test ensuring compatibility with an old daemon 2021-03-16 14:20:41 +01:00
repair.sh Make --repair-path also repair corrupt optimised links 2022-01-11 11:57:45 +01:00
repl.sh nix repl: make symlinks with the :bl command 2022-04-20 00:20:29 +03:00
restricted.nix
restricted.sh
search.nix
search.sh Use grep -c instead of grep|wc -l in some nix search tests 2022-06-07 18:25:59 +02:00
secure-drv-outputs.nix
secure-drv-outputs.sh
selfref-gc.sh Disable the selfref-gc test when the daemon is too old 2022-04-21 10:06:39 +02:00
setuid.nix Fix 22.05 eval warnings 2022-06-07 14:27:10 +02:00
shell-hello.nix Allow selecting derivation outputs using 'installable!outputs' 2022-05-03 13:43:52 +02:00
shell.nix Make nix-shell work when nixpkgs is content-addressed 2021-11-26 09:56:48 +01:00
shell.sh Allow selecting derivation outputs using 'installable!outputs' 2022-05-03 13:43:52 +02:00
shell.shebang.rb
shell.shebang.sh
signing.sh Rename 'nix store sign-paths' to 'nix store sign' 2021-01-13 23:32:37 +01:00
simple-failing.nix Inline file 2021-12-07 21:45:09 +01:00
simple.builder.sh
simple.nix
simple.sh Fix segfault or stack overflow caused by large derivation fields 2022-01-19 15:21:56 +01:00
sourcehut-flakes.nix fix sourcehut brach/tag resolving regression 2022-06-11 16:52:20 -03:00
ssh-relay.sh Move most store-related commands to 'nix store' 2020-12-03 23:22:22 +01:00
store-ping.sh Fix the store ping test 2022-01-26 14:15:03 +01:00
structured-attrs-shell.nix Add testcase for nix develop with __structuredAttrs 2021-06-22 19:15:57 +02:00
structured-attrs.nix Prefix env vars for attrs.* files with NIX_ 2021-06-22 19:45:08 +02:00
structured-attrs.sh Fix the min bound for the structured-attrs test 2021-10-14 16:00:59 +02:00
substitute-with-invalid-ca.sh Check the CA hash when importing stuff in the local store 2021-06-01 15:09:24 +02:00
suggestions.sh Also display some suggestions for invalid formal arguments 2022-03-08 16:40:22 +01:00
tarball.sh fetchTree: Do not re-fetch paths already present 2022-02-28 21:37:49 +01:00
timeout.nix
timeout.sh Allow running all the tests with the daemon 2021-07-27 17:06:11 +02:00
undefined-variable.nix Add a test that nix repl --show-trace actually shows the trace 2021-12-28 15:54:46 +03:00
user-envs.builder.sh
user-envs.nix Don't hide repeated values while generating manifest.nix 2022-03-22 13:18:56 +01:00
user-envs.sh Add some tests for nix-env -q --json 2022-03-16 21:33:38 +01:00
why-depends.sh Make nix why-depends quieter by default 2022-01-19 14:24:14 +01:00
zstd.sh add tests for zstd compression 2021-04-09 23:13:08 +02:00