diff --git a/modules/top-level/test.nix b/modules/top-level/test.nix index 1f007ec5..79a3229c 100644 --- a/modules/top-level/test.nix +++ b/modules/top-level/test.nix @@ -238,7 +238,7 @@ in build.test = assert lib.assertMsg (cfg.runNvim -> cfg.buildNixvim) "`test.runNvim` requires `test.buildNixvim`."; - pkgs.runCommandNoCCLocal cfg.name + pkgs.runCommandLocal cfg.name { nativeBuildInputs = lib.optionals cfg.buildNixvim [ config.build.packageUnchecked diff --git a/tests/enable-except-in-tests.nix b/tests/enable-except-in-tests.nix index 2ef815e3..721a161a 100644 --- a/tests/enable-except-in-tests.nix +++ b/tests/enable-except-in-tests.nix @@ -1,7 +1,7 @@ { pkgs, linkFarm, - runCommandNoCCLocal, + runCommandLocal, mkTestDerivationFromNixvimModule, makeNixvimWithModule, }: @@ -21,7 +21,7 @@ let let nvim = makeNixvimWithModule { inherit pkgs module; }; in - runCommandNoCCLocal "enable-except-in-tests-not-in-test" + runCommandLocal "enable-except-in-tests-not-in-test" { printConfig = "${nvim}/bin/nixvim-print-init"; } '' if ! "$printConfig" | grep 'require("image").setup'; then diff --git a/tests/extend.nix b/tests/extend.nix index 507428be..e6891ffa 100644 --- a/tests/extend.nix +++ b/tests/extend.nix @@ -1,6 +1,6 @@ { makeNixvimWithModule, - runCommandNoCCLocal, + runCommandLocal, }: let firstStage = makeNixvimWithModule { @@ -13,7 +13,7 @@ let generated = secondStage.extend { extraConfigLua = "-- third stage"; }; in -runCommandNoCCLocal "extend-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' +runCommandLocal "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 3492b10c..53a77c40 100644 --- a/tests/extra-args.nix +++ b/tests/extra-args.nix @@ -1,6 +1,6 @@ { makeNixvimWithModule, - runCommandNoCCLocal, + runCommandLocal, }: let defaultModule = @@ -31,7 +31,7 @@ let }; }; in -runCommandNoCCLocal "special-arg-test" { printConfig = "${generated}/bin/nixvim-print-init"; } '' +runCommandLocal "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 d959de08..5a11b818 100644 --- a/tests/extra-files.nix +++ b/tests/extra-files.nix @@ -1,6 +1,6 @@ { makeNixvimWithModule, - runCommandNoCCLocal, + runCommandLocal, }: let extraFiles = { @@ -15,7 +15,7 @@ let }; }; in -runCommandNoCCLocal "extra-files-test" +runCommandLocal "extra-files-test" { root = build.config.build.extraFiles; files = builtins.attrNames extraFiles; diff --git a/tests/failing-tests.nix b/tests/failing-tests.nix index edab2435..87bb490b 100644 --- a/tests/failing-tests.nix +++ b/tests/failing-tests.nix @@ -1,7 +1,7 @@ { pkgs, linkFarmFromDrvs, - runCommandNoCCLocal, + runCommandLocal, mkTestDerivationFromNixvimModule, }: let @@ -10,7 +10,7 @@ let args: pkgs.testers.testBuildFailure (mkTestDerivationFromNixvimModule ({ inherit pkgs; } // args)); in linkFarmFromDrvs "failing-tests" [ - (runCommandNoCCLocal "fail-running-nvim" + (runCommandLocal "fail-running-nvim" { failed = mkFailingNixvimTest { name = "prints-hello-world"; @@ -27,7 +27,7 @@ linkFarmFromDrvs "failing-tests" [ touch $out '' ) - (runCommandNoCCLocal "fail-on-warnings" + (runCommandLocal "fail-on-warnings" { failed = mkFailingNixvimTest { name = "warns-hello-world"; @@ -45,7 +45,7 @@ linkFarmFromDrvs "failing-tests" [ touch $out '' ) - (runCommandNoCCLocal "fail-on-assertions" + (runCommandLocal "fail-on-assertions" { failed = mkFailingNixvimTest { name = "asserts-hello-world"; diff --git a/tests/generated.nix b/tests/generated.nix index bd4ac548..626a89f7 100644 --- a/tests/generated.nix +++ b/tests/generated.nix @@ -1,6 +1,6 @@ { lib, - runCommandNoCCLocal, + runCommandLocal, pkgs, }: let @@ -100,7 +100,7 @@ let ) ); in -runCommandNoCCLocal "generated-sources-test" +runCommandLocal "generated-sources-test" { __structuredAttrs = true; inherit errors; diff --git a/tests/lib-tests.nix b/tests/lib-tests.nix index c3ad7161..c531d89b 100644 --- a/tests/lib-tests.nix +++ b/tests/lib-tests.nix @@ -3,7 +3,7 @@ { helpers, lib, - runCommandNoCCLocal, + runCommandLocal, writeText, }: let @@ -493,9 +493,9 @@ let }; in if results == [ ] then - runCommandNoCCLocal "lib-tests-success" { } "touch $out" + runCommandLocal "lib-tests-success" { } "touch $out" else - runCommandNoCCLocal "lib-tests-failure" + runCommandLocal "lib-tests-failure" { results = lib.concatStringsSep "\n" ( builtins.map (result: '' diff --git a/tests/lsp-servers.nix b/tests/lsp-servers.nix index e3365bbc..dc72e21a 100644 --- a/tests/lsp-servers.nix +++ b/tests/lsp-servers.nix @@ -2,7 +2,7 @@ lib, nixvimConfiguration, stdenv, - runCommandNoCCLocal, + runCommandLocal, name ? "lsp-all-servers", }: let @@ -101,7 +101,7 @@ in # This fails on darwin # See https://github.com/NixOS/nix/issues/4119 if stdenv.isDarwin then - runCommandNoCCLocal name { } '' + runCommandLocal name { } '' touch $out '' else diff --git a/tests/maintainers.nix b/tests/maintainers.nix index e4dc3030..1f3724fb 100644 --- a/tests/maintainers.nix +++ b/tests/maintainers.nix @@ -1,7 +1,7 @@ { lib, nixpkgsLib, - runCommandNoCCLocal, + runCommandLocal, }: let inherit (lib) attrNames filter length; @@ -10,7 +10,7 @@ let duplicates = filter (name: nixpkgsList ? ${name}) (attrNames nixvimList); count = length duplicates; in -runCommandNoCCLocal "maintainers-test" { inherit count duplicates; } '' +runCommandLocal "maintainers-test" { inherit count duplicates; } '' if [ $count -gt 0 ]; then echo "$count nixvim maintainers are also nixpkgs maintainers:" for name in $duplicates; do diff --git a/tests/package-options.nix b/tests/package-options.nix index 66c16ec1..7af30250 100644 --- a/tests/package-options.nix +++ b/tests/package-options.nix @@ -3,7 +3,7 @@ { nixvimConfiguration, lib, - runCommandNoCCLocal, + runCommandLocal, }: let inherit (builtins) @@ -47,7 +47,7 @@ let || match ''pkgs[.].*'' (opt.defaultText.text or "") == null ) drvOptions; in -runCommandNoCCLocal "validate-package-options" +runCommandLocal "validate-package-options" { # Use structuredAttrs to avoid "Argument List Too Long" errors # and get proper bash array support. diff --git a/tests/plugins-by-name.nix b/tests/plugins-by-name.nix index 5f5c3979..1f3ba437 100644 --- a/tests/plugins-by-name.nix +++ b/tests/plugins-by-name.nix @@ -2,7 +2,7 @@ lib, nixvimConfiguration, linkFarmFromDrvs, - runCommandNoCCLocal, + runCommandLocal, }: let by-name = ../plugins/by-name; @@ -54,7 +54,7 @@ let in linkFarmFromDrvs "plugins-by-name" [ # Ensures all files matching `plugins/by-name/*` are directories - (runCommandNoCCLocal "file-types" + (runCommandLocal "file-types" { __structuredAttrs = true; inherit (children) regular symlink unknown; @@ -88,7 +88,7 @@ linkFarmFromDrvs "plugins-by-name" [ ) # Check default.nix files exist for each directory - (runCommandNoCCLocal "default-nix-exists" + (runCommandLocal "default-nix-exists" { __structuredAttrs = true; missingPlugins = builtins.filter ( @@ -127,7 +127,7 @@ linkFarmFromDrvs "plugins-by-name" [ ) # Ensures all plugin enable options are declared in a directory matching the plugin name - (runCommandNoCCLocal "mismatched-plugin-names" + (runCommandLocal "mismatched-plugin-names" { __structuredAttrs = true; @@ -153,7 +153,7 @@ linkFarmFromDrvs "plugins-by-name" [ ) # Ensure all plugin enable option are declared under an expected namespace - (runCommandNoCCLocal "unknown-plugin-namespaces" + (runCommandLocal "unknown-plugin-namespaces" { __structuredAttrs = true;