diff --git a/tests/enable-except-in-tests.nix b/tests/enable-except-in-tests.nix index 65070198c..2ef815e3e 100644 --- a/tests/enable-except-in-tests.nix +++ b/tests/enable-except-in-tests.nix @@ -1,5 +1,7 @@ { pkgs, + linkFarm, + runCommandNoCCLocal, mkTestDerivationFromNixvimModule, makeNixvimWithModule, }: @@ -19,7 +21,7 @@ let let nvim = makeNixvimWithModule { inherit pkgs module; }; in - pkgs.runCommand "enable-except-in-tests-not-in-test" + runCommandNoCCLocal "enable-except-in-tests-not-in-test" { printConfig = "${nvim}/bin/nixvim-print-init"; } '' if ! "$printConfig" | grep 'require("image").setup'; then @@ -31,7 +33,7 @@ let touch $out ''; in -pkgs.linkFarm "enable-except-in-tests" [ +linkFarm "enable-except-in-tests" [ { name = "in-test"; path = inTest; diff --git a/tests/extend.nix b/tests/extend.nix index 00bd82815..507428be3 100644 --- a/tests/extend.nix +++ b/tests/extend.nix @@ -1,4 +1,7 @@ -{ makeNixvimWithModule, pkgs }: +{ + makeNixvimWithModule, + runCommandNoCCLocal, +}: let firstStage = makeNixvimWithModule { module = { @@ -10,7 +13,7 @@ let generated = secondStage.extend { extraConfigLua = "-- third stage"; }; in -pkgs.runCommand "extend-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' +runCommandNoCCLocal "extend-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' config=$($printConfig) for stage in "first" "second" "third"; do if ! "$printConfig" | grep -q -- "-- $stage stage"; then diff --git a/tests/extra-args.nix b/tests/extra-args.nix index e43f6dff1..3492b10c4 100644 --- a/tests/extra-args.nix +++ b/tests/extra-args.nix @@ -1,4 +1,7 @@ -{ makeNixvimWithModule, pkgs }: +{ + makeNixvimWithModule, + runCommandNoCCLocal, +}: let defaultModule = { regularArg, ... }: @@ -28,7 +31,7 @@ let }; }; in -pkgs.runCommand "special-arg-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' +runCommandNoCCLocal "special-arg-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' config=$($printConfig) if ! "$printConfig" | grep -- '-- regularArg=regularValue'; then echo "Missing regularArg in config" diff --git a/tests/extra-files.nix b/tests/extra-files.nix index c9894501f..d959de083 100644 --- a/tests/extra-files.nix +++ b/tests/extra-files.nix @@ -1,4 +1,7 @@ -{ makeNixvimWithModule, pkgs }: +{ + makeNixvimWithModule, + runCommandNoCCLocal, +}: let extraFiles = { "one".text = "one"; @@ -12,7 +15,7 @@ let }; }; in -pkgs.runCommand "extra-files-test" +runCommandNoCCLocal "extra-files-test" { root = build.config.build.extraFiles; files = builtins.attrNames extraFiles; diff --git a/tests/lib-tests.nix b/tests/lib-tests.nix index 870669c8c..b09cec183 100644 --- a/tests/lib-tests.nix +++ b/tests/lib-tests.nix @@ -1,9 +1,10 @@ # For shorter test iterations run the following in the root of the repo: # `echo ':b checks.${builtins.currentSystem}.lib-tests' | nix repl .` { - lib, - pkgs, helpers, + lib, + runCommandNoCCLocal, + writeText, }: let luaNames = { @@ -45,9 +46,9 @@ let ]; }; - drv = pkgs.writeText "example-derivation" "hello, world!"; + drv = writeText "example-derivation" "hello, world!"; - results = pkgs.lib.runTests { + results = lib.runTests { testToLuaObject = { expr = helpers.toLuaObject { foo = "bar"; @@ -412,11 +413,11 @@ let }; in if results == [ ] then - pkgs.runCommand "lib-tests-success" { } "touch $out" + runCommandNoCCLocal "lib-tests-success" { } "touch $out" else - pkgs.runCommand "lib-tests-failure" + runCommandNoCCLocal "lib-tests-failure" { - results = pkgs.lib.concatStringsSep "\n" ( + results = lib.concatStringsSep "\n" ( builtins.map (result: '' ${result.name}: expected: ${lib.generators.toPretty { } result.expected} diff --git a/tests/main.nix b/tests/main.nix index d43eac61e..e2c2de1ba 100644 --- a/tests/main.nix +++ b/tests/main.nix @@ -4,6 +4,7 @@ callTest, helpers, lib ? pkgs.lib, + linkFarm, pkgs, pkgsUnfree, }: @@ -54,14 +55,14 @@ lib.pipe (testFiles ++ [ exampleFiles ]) [ }: { inherit name; - path = pkgs.linkFarm name (builtins.mapAttrs (moduleToTest file) cases); + path = linkFarm name (builtins.mapAttrs (moduleToTest file) cases); } )) (helpers.groupListBySize 10) (lib.imap1 ( i: group: rec { name = "test-${toString i}"; - value = pkgs.linkFarm name group; + value = linkFarm name group; } )) builtins.listToAttrs diff --git a/tests/maintainers.nix b/tests/maintainers.nix index a9033aacf..f99e73e34 100644 --- a/tests/maintainers.nix +++ b/tests/maintainers.nix @@ -1,6 +1,6 @@ { - pkgs ? import { }, - lib ? pkgs.lib, + lib, + runCommandNoCCLocal, }: let inherit (lib) attrNames filter length; @@ -9,7 +9,7 @@ let duplicates = filter (name: nixpkgsList ? ${name}) (attrNames nixvimList); count = length duplicates; in -pkgs.runCommand "maintainers-test" { inherit count duplicates; } '' +runCommandNoCCLocal "maintainers-test" { inherit count duplicates; } '' if [ $count -gt 0 ]; then echo "$count nixvim maintainers are also nixpkgs maintainers:" for name in $duplicates; do