diff options
author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
---|---|---|
committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
commit | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (patch) | |
tree | 6431c14751da2ff638abc06b1c8e11f99315f2c3 /pkgs/development/tools | |
parent | 25193e2732e178f701f517ca15ff802f03b29933 (diff) | |
download | nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.gz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.bz2 nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.lz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.xz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.zst nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.zip |
treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have nativeCheckInputs to do that instead. Doing this treewide change allows to keep hashes identical to before the introduction of nativeCheckInputs.
Diffstat (limited to 'pkgs/development/tools')
83 files changed, 84 insertions, 84 deletions
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 2db9533590a..e9ce87dc084 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -89,7 +89,7 @@ buildPythonApplication rec { update_checker ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ aioresponses mock pytest-asyncio diff --git a/pkgs/development/tools/analysis/cpplint/default.nix b/pkgs/development/tools/analysis/cpplint/default.nix index 2f665b8395b..7be303a52a4 100644 --- a/pkgs/development/tools/analysis/cpplint/default.nix +++ b/pkgs/development/tools/analysis/cpplint/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { patchShebangs cpplint_unittest.py ''; - checkInputs = with python3Packages; [ pytest pytest-runner ]; + nativeCheckInputs = with python3Packages; [ pytest pytest-runner ]; checkPhase = '' ./cpplint_unittest.py ''; diff --git a/pkgs/development/tools/analysis/cvehound/default.nix b/pkgs/development/tools/analysis/cvehound/default.nix index 5bd6cdc0069..d6b08fb0615 100644 --- a/pkgs/development/tools/analysis/cvehound/default.nix +++ b/pkgs/development/tools/analysis/cvehound/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sympy ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitpython psutil pytestCheckHook diff --git a/pkgs/development/tools/analysis/oclgrind/default.nix b/pkgs/development/tools/analysis/oclgrind/default.nix index 9e8d1da4d36..c28c8b0ead1 100644 --- a/pkgs/development/tools/analysis/oclgrind/default.nix +++ b/pkgs/development/tools/analysis/oclgrind/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; buildInputs = [ llvmPackages.llvm llvmPackages.clang-unwrapped readline ]; cmakeFlags = [ diff --git a/pkgs/development/tools/apkid/default.nix b/pkgs/development/tools/apkid/default.nix index f5e05fe96bb..06d798e481d 100644 --- a/pkgs/development/tools/apkid/default.nix +++ b/pkgs/development/tools/apkid/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { yara-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/appthreat-depscan/default.nix b/pkgs/development/tools/appthreat-depscan/default.nix index 461b250fa6b..82571293abc 100644 --- a/pkgs/development/tools/appthreat-depscan/default.nix +++ b/pkgs/development/tools/appthreat-depscan/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix index 78224176e5a..a38acbd53c9 100644 --- a/pkgs/development/tools/backblaze-b2/default.nix +++ b/pkgs/development/tools/backblaze-b2/default.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication rec { tabulate ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ backoff more-itertools pytestCheckHook diff --git a/pkgs/development/tools/bashate/default.nix b/pkgs/development/tools/bashate/default.nix index d768ff481a4..31714db5c89 100644 --- a/pkgs/development/tools/bashate/default.nix +++ b/pkgs/development/tools/bashate/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ fixtures mock pytestCheckHook diff --git a/pkgs/development/tools/beautysh/default.nix b/pkgs/development/tools/beautysh/default.nix index f01857fc608..e592133e59b 100644 --- a/pkgs/development/tools/beautysh/default.nix +++ b/pkgs/development/tools/beautysh/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { types-setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 0ebf23d5dc3..071bb884237 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -32,7 +32,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkInputs = [ + nativeCheckInputs = [ git # Required for TestGitCloner protobuf # Required for buftesting.GetProtocFilePaths ]; diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 0c2b2005ba8..cac4b3c650b 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ tzdata ] ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [ ksh diff --git a/pkgs/development/tools/build-managers/build2/bpkg.nix b/pkgs/development/tools/build-managers/build2/bpkg.nix index 628c9304c1d..cb0bcd70345 100644 --- a/pkgs/development/tools/build-managers/build2/bpkg.nix +++ b/pkgs/development/tools/build-managers/build2/bpkg.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { libodb libodb-sqlite ]; - checkInputs = [ + nativeCheckInputs = [ git openssl ]; diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index 7b81126dae9..2b7ccc4a6c0 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -64,7 +64,7 @@ in newPython.pkgs.buildPythonApplication rec { urllib3 ] ++ lib.optionals stdenv.isDarwin [ idna cryptography pyopenssl ]; - checkInputs = [ + nativeCheckInputs = [ pkg-config git ] ++ (with newPython.pkgs; [ diff --git a/pkgs/development/tools/build-managers/goredo/default.nix b/pkgs/development/tools/build-managers/goredo/default.nix index 473cbb8202b..54c5fed72db 100644 --- a/pkgs/development/tools/build-managers/goredo/default.nix +++ b/pkgs/development/tools/build-managers/goredo/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { nativeBuildInputs = [ zstd ]; - checkInputs = lib.optionals doCheck [ python3 perl ]; + nativeCheckInputs = lib.optionals doCheck [ python3 perl ]; SHARNESS_TEST_SRCDIR = sharness + "/share/sharness"; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 5f4fa56bd1e..5591b163423 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -69,7 +69,7 @@ python3.pkgs.buildPythonApplication rec { # require a typical building environment (including C compiler and stuff). # Just for the sake of documentation, the next lines are maintained here. doCheck = false; - checkInputs = [ ninja pkg-config ]; + nativeCheckInputs = [ ninja pkg-config ]; checkPhase = '' python ./run_project_tests.py ''; diff --git a/pkgs/development/tools/check-jsonschema/default.nix b/pkgs/development/tools/check-jsonschema/default.nix index dd49074300a..7c25ddd34cd 100644 --- a/pkgs/development/tools/check-jsonschema/default.nix +++ b/pkgs/development/tools/check-jsonschema/default.nix @@ -21,7 +21,7 @@ buildPythonApplication rec { click ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-xdist responses diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 210f0d8f844..90c2ea916c5 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { update_checker ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix index 6d3bc866367..093e015d36e 100644 --- a/pkgs/development/tools/clickable/default.nix +++ b/pkgs/development/tools/clickable/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { argcomplete ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ # Test require network connection diff --git a/pkgs/development/tools/codespell/default.nix b/pkgs/development/tools/codespell/default.nix index 87fab56778c..8315aa20aa1 100644 --- a/pkgs/development/tools/codespell/default.nix +++ b/pkgs/development/tools/codespell/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools-scm ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aspell-python chardet pytestCheckHook diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index f77acfffa9b..60221444da0 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -44,7 +44,7 @@ let ocamlPackages.angstrom ] ++ extraBuildInputs; - checkInputs = [ cacert ]; + nativeCheckInputs = [ cacert ]; meta = { description = "Tool for searching and changing code structure"; diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 30e3043ba8a..143362d98a4 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -208,7 +208,7 @@ stdenv.mkDerivation rec { "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchCancellation" "GitHub.Runner.Common.Tests.Worker.WorkerL0.DispatchRunNewJob" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/tools/database/litecli/default.nix b/pkgs/development/tools/database/litecli/default.nix index a1c35c88ee8..98a4a27e4b5 100644 --- a/pkgs/development/tools/database/litecli/default.nix +++ b/pkgs/development/tools/database/litecli/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { sqlparse ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix index b93b1ab763c..256178e7a9d 100644 --- a/pkgs/development/tools/database/sqlfluff/default.nix +++ b/pkgs/development/tools/database/sqlfluff/default.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { importlib_metadata ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hypothesis pytestCheckHook ]; diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix index b308d8a48c3..27af4acb352 100644 --- a/pkgs/development/tools/devpi-client/default.nix +++ b/pkgs/development/tools/devpi-client/default.nix @@ -48,7 +48,7 @@ buildPythonApplication rec { setuptools ]; - checkInputs = [ + nativeCheckInputs = [ devpi-server git mercurial diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index c6852ddf1cb..d9de1b09c21 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -61,7 +61,7 @@ buildPythonApplication rec { waitress ] ++ passlib.optional-dependencies.argon2; - checkInputs = [ + nativeCheckInputs = [ beautifulsoup4 nginx py diff --git a/pkgs/development/tools/distgen/default.nix b/pkgs/development/tools/distgen/default.nix index dbf00ea8e05..d1e506ea978 100644 --- a/pkgs/development/tools/distgen/default.nix +++ b/pkgs/development/tools/distgen/default.nix @@ -9,7 +9,7 @@ python3.pkgs.buildPythonApplication rec { sha256 = "08f9rw5irgv0gw7jizk5f9csn0yhrdnb84k40px1zbypsylvr5c5"; }; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest mock ]; diff --git a/pkgs/development/tools/eliot-tree/default.nix b/pkgs/development/tools/eliot-tree/default.nix index adcedfe643c..7188835e27d 100644 --- a/pkgs/development/tools/eliot-tree/default.nix +++ b/pkgs/development/tools/eliot-tree/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "18gvijsm0vh3x83mv8dd80c3mpm80r7i111qsg4y7rj4i590phma"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ testtools pytest ]; diff --git a/pkgs/development/tools/garble/default.nix b/pkgs/development/tools/garble/default.nix index 0d01de127ed..e78044b85b2 100644 --- a/pkgs/development/tools/garble/default.nix +++ b/pkgs/development/tools/garble/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorSha256 = "sha256-lGU9jbeOM8tSYZGIqQhH5I2RlBGnqrA6JUQpuHrLwKU="; # Used for some of the tests. - checkInputs = [git]; + nativeCheckInputs = [git]; preBuild = lib.optionalString (!stdenv.isx86_64) '' # The test assumex amd64 assembly diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index d2d7e523a94..0ab862bf1b2 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - checkInputs = with llvmPackages; [ + nativeCheckInputs = with llvmPackages; [ clang llvm ] ++ lib.optionals stdenv.isDarwin [ getconf ]; diff --git a/pkgs/development/tools/hatch/default.nix b/pkgs/development/tools/hatch/default.nix index 952a8ecb16c..ad4746c48c0 100644 --- a/pkgs/development/tools/hatch/default.nix +++ b/pkgs/development/tools/hatch/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { virtualenv ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook pytest-mock diff --git a/pkgs/development/tools/ineffassign/default.nix b/pkgs/development/tools/ineffassign/default.nix index 16e392b6bbc..c472d9b0b0f 100644 --- a/pkgs/development/tools/ineffassign/default.nix +++ b/pkgs/development/tools/ineffassign/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Detect ineffectual assignments in Go code"; diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index ccbee96fdd5..31d6d281ba5 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/ankitpokhrel/jira-cli/internal/version.Version=${version}" ]; - checkInputs = [ less more ]; # Tests expect a pager in $PATH + nativeCheckInputs = [ less more ]; # Tests expect a pager in $PATH passthru = { tests.version = testers.testVersion { diff --git a/pkgs/development/tools/jira_cli/default.nix b/pkgs/development/tools/jira_cli/default.nix index 9145f4a42cd..d8a639ec5b9 100644 --- a/pkgs/development/tools/jira_cli/default.nix +++ b/pkgs/development/tools/jira_cli/default.nix @@ -16,7 +16,7 @@ in # Tests rely on VCR cassettes being written during tests. R/O nix store prevents this. doCheck = false; - checkInputs = with python3Packages; [ vcrpy mock hiro ]; + nativeCheckInputs = with python3Packages; [ vcrpy mock hiro ]; buildInputs = [ libffi openssl ]; propagatedBuildInputs = with python3Packages; [ requests six suds-jurko termcolor keyring diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 002dffd05f7..8bcc8a73fb9 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - checkInputs = [ coreutils bash ]; + nativeCheckInputs = [ coreutils bash ]; preCheck = '' # USER must not be empty diff --git a/pkgs/development/tools/ko/default.nix b/pkgs/development/tools/ko/default.nix index 490ea324104..ab77a3d0606 100644 --- a/pkgs/development/tools/ko/default.nix +++ b/pkgs/development/tools/ko/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X github.com/google/ko/pkg/commands.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' # Feed in all the tests for testing # This is because subPackages above limits what is built to just what we diff --git a/pkgs/development/tools/krankerl/default.nix b/pkgs/development/tools/krankerl/default.nix index 0d8a5e8acf0..6951b358b6b 100644 --- a/pkgs/development/tools/krankerl/default.nix +++ b/pkgs/development/tools/krankerl/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { sqlite ]; - checkInputs = [ + nativeCheckInputs = [ file ]; diff --git a/pkgs/development/tools/language-servers/rnix-lsp/default.nix b/pkgs/development/tools/language-servers/rnix-lsp/default.nix index 3da8d44d433..c7ab04d7cdc 100644 --- a/pkgs/development/tools/language-servers/rnix-lsp/default.nix +++ b/pkgs/development/tools/language-servers/rnix-lsp/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-RKHBp+/bEH9FEPLcf1MKmTugk1A8rQU447mNm9Le3DE="; - checkInputs = lib.optional (!stdenv.isDarwin) nix; + nativeCheckInputs = lib.optional (!stdenv.isDarwin) nix; meta = with lib; { description = "A work-in-progress language server for Nix, with syntax checking and basic completion"; diff --git a/pkgs/development/tools/libsigrokdecode/default.nix b/pkgs/development/tools/libsigrokdecode/default.nix index 6c09b5392e2..6066286fc91 100644 --- a/pkgs/development/tools/libsigrokdecode/default.nix +++ b/pkgs/development/tools/libsigrokdecode/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config autoreconfHook ]; buildInputs = [ glib python3 libxcrypt ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; meta = with lib; { diff --git a/pkgs/development/tools/maligned/default.nix b/pkgs/development/tools/maligned/default.nix index f39b83489f9..8df4d79b592 100644 --- a/pkgs/development/tools/maligned/default.nix +++ b/pkgs/development/tools/maligned/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { allowGoReference = true; - checkInputs = [ go ]; + nativeCheckInputs = [ go ]; meta = with lib; { description = "Tool to detect Go structs that would take less memory if their fields were sorted"; diff --git a/pkgs/development/tools/mbed-cli/default.nix b/pkgs/development/tools/mbed-cli/default.nix index 12e7d191547..cf6e65c46c7 100644 --- a/pkgs/development/tools/mbed-cli/default.nix +++ b/pkgs/development/tools/mbed-cli/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "1228plh55id03qywsw0ai88ypdpbh9iz18jfcyhn21pci7mj77fv"; }; - checkInputs = [ + nativeCheckInputs = [ git mercurial pytest diff --git a/pkgs/development/tools/memray/default.nix b/pkgs/development/tools/memray/default.nix index 0d4a9c6ccfb..e5510aa5f80 100644 --- a/pkgs/development/tools/memray/default.nix +++ b/pkgs/development/tools/memray/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ ipython pytestCheckHook ] ++ lib.optionals (pythonOlder "3.11") [ diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 2b24582d701..cad25a942d6 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -47,7 +47,7 @@ let ccache = stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ # test/run requires the compgen function which is available in # bashInteractive, but not bash. bashInteractive diff --git a/pkgs/development/tools/misc/cli11/default.nix b/pkgs/development/tools/misc/cli11/default.nix index f55857a4ef0..6efadf97681 100644 --- a/pkgs/development/tools/misc/cli11/default.nix +++ b/pkgs/development/tools/misc/cli11/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - checkInputs = [ boost python3 catch2 ]; + nativeCheckInputs = [ boost python3 catch2 ]; doCheck = true; diff --git a/pkgs/development/tools/misc/cmake-language-server/default.nix b/pkgs/development/tools/misc/cmake-language-server/default.nix index 892884e9339..35ce6430ce6 100644 --- a/pkgs/development/tools/misc/cmake-language-server/default.nix +++ b/pkgs/development/tools/misc/cmake-language-server/default.nix @@ -41,7 +41,7 @@ buildPythonApplication rec { pygls ]; - checkInputs = [ + nativeCheckInputs = [ cmake cmake-format pytest-datadir diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix index 3dc84ad5991..59f00a9b022 100644 --- a/pkgs/development/tools/misc/cvise/default.nix +++ b/pkgs/development/tools/misc/cvise/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { psutil ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook unifdef ]; diff --git a/pkgs/development/tools/misc/debugedit/default.nix b/pkgs/development/tools/misc/debugedit/default.nix index afac7168c5b..8da0effe7be 100644 --- a/pkgs/development/tools/misc/debugedit/default.nix +++ b/pkgs/development/tools/misc/debugedit/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config help2man ]; buildInputs = [ elfutils ]; - checkInputs = [ util-linux ]; # Tests use `rev` + nativeCheckInputs = [ util-linux ]; # Tests use `rev` src = fetchgit { url = "git://sourceware.org/git/debugedit.git"; diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix index cfc6f1b5de6..b814cd2b235 100644 --- a/pkgs/development/tools/misc/gef/default.nix +++ b/pkgs/development/tools/misc/gef/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ]} ''; - checkInputs = [ + nativeCheckInputs = [ gdb file ps diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index 11e7547afc4..155324aa49c 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-a9yCnGg+4f+UoHbGG8a47z2duBD3qXcAzPKnE4PQsvM="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Reliable project licenses detector"; diff --git a/pkgs/development/tools/misc/hydra/unstable.nix b/pkgs/development/tools/misc/hydra/unstable.nix index 1277050d1c9..4c141f5a87b 100644 --- a/pkgs/development/tools/misc/hydra/unstable.nix +++ b/pkgs/development/tools/misc/hydra/unstable.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation rec { nukeReferences ]; - checkInputs = [ + nativeCheckInputs = [ cacert foreman glibcLocales diff --git a/pkgs/development/tools/misc/jiq/default.nix b/pkgs/development/tools/misc/jiq/default.nix index 2d566b0eac9..9889ca67c5a 100644 --- a/pkgs/development/tools/misc/jiq/default.nix +++ b/pkgs/development/tools/misc/jiq/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; postInstall = '' wrapProgram $out/bin/jiq \ diff --git a/pkgs/development/tools/misc/libtree/default.nix b/pkgs/development/tools/misc/libtree/default.nix index 219ce239f48..624d33561e6 100644 --- a/pkgs/development/tools/misc/libtree/default.nix +++ b/pkgs/development/tools/misc/libtree/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { # note: "make check" returns exit code 0 even when the tests fail. # This has been reported upstream: # https://github.com/haampie/libtree/issues/77 - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; checkTarget = [ "check" ]; doCheck = true; diff --git a/pkgs/development/tools/misc/linuxkit/default.nix b/pkgs/development/tools/misc/linuxkit/default.nix index 13944ad0222..be07f7e9c24 100644 --- a/pkgs/development/tools/misc/linuxkit/default.nix +++ b/pkgs/development/tools/misc/linuxkit/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { "-X github.com/linuxkit/linuxkit/src/cmd/linuxkit/version.Version=${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; passthru.tests.version = testers.testVersion { package = linuxkit; diff --git a/pkgs/development/tools/misc/ltrace/default.nix b/pkgs/development/tools/misc/ltrace/default.nix index 79b6cf2a8b5..9114e7cf4ce 100644 --- a/pkgs/development/tools/misc/ltrace/default.nix +++ b/pkgs/development/tools/misc/ltrace/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; # Some patches impact ./configure. buildInputs = [ elfutils ]; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; # Import Fedora's (very) large patch series: bug fixes, architecture support, # etc. RH/Fedora are currently working with upstream to merge all these diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix index 5c88bd13059..37197727974 100644 --- a/pkgs/development/tools/misc/nrfutil/default.nix +++ b/pkgs/development/tools/misc/nrfutil/default.nix @@ -32,7 +32,7 @@ buildPythonApplication rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ behave nose ]; diff --git a/pkgs/development/tools/misc/patsh/default.nix b/pkgs/development/tools/misc/patsh/default.nix index 63ec7ec1e5e..ba3b232a417 100644 --- a/pkgs/development/tools/misc/patsh/default.nix +++ b/pkgs/development/tools/misc/patsh/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-R6ScpLYbEJAu7+CyJsMdljtXq7wsMojHK5O1lH+E/E8="; - checkInputs = [ custom ]; + nativeCheckInputs = [ custom ]; # see comment on `custom` postPatch = '' diff --git a/pkgs/development/tools/misc/python-launcher/default.nix b/pkgs/development/tools/misc/python-launcher/default.nix index f8023022bcd..c1d07cf0c76 100644 --- a/pkgs/development/tools/misc/python-launcher/default.nix +++ b/pkgs/development/tools/misc/python-launcher/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-2lgWybEPi6HEUMYuGDRWMjWoc94CrFHPP5IeKUjj0q4="; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; useNextest = true; diff --git a/pkgs/development/tools/misc/replacement/default.nix b/pkgs/development/tools/misc/replacement/default.nix index cbdd8e37c5c..75c5363ff67 100644 --- a/pkgs/development/tools/misc/replacement/default.nix +++ b/pkgs/development/tools/misc/replacement/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook sh ]; diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix index 95b1a5cc12a..9694fcd5276 100644 --- a/pkgs/development/tools/misc/strace-analyzer/default.nix +++ b/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE="; - checkInputs = [ strace ]; + nativeCheckInputs = [ strace ]; meta = with lib; { description = "Analyzes strace output"; diff --git a/pkgs/development/tools/misc/texinfo/common.nix b/pkgs/development/tools/misc/texinfo/common.nix index 036e992e973..38a44e8c9cb 100644 --- a/pkgs/development/tools/misc/texinfo/common.nix +++ b/pkgs/development/tools/misc/texinfo/common.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation { installFlags = [ "TEXMF=$(out)/texmf-dist" ]; installTargets = [ "install" "install-tex" ]; - checkInputs = [ procps ]; + nativeCheckInputs = [ procps ]; doCheck = interactive && !stdenv.isDarwin diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index d448251bf13..08f5b85bc5e 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { substituteInPlace ${pname}.py --replace 0.1.6 ${version} ''; - checkInputs = [ clang-unwrapped /* clang-format */ ]; + nativeCheckInputs = [ clang-unwrapped /* clang-format */ ]; doCheck = false; # 3 or 4 failures depending on version, haven't investigated. diff --git a/pkgs/development/tools/norminette/default.nix b/pkgs/development/tools/norminette/default.nix index 5709fa0f469..73fb7012789 100644 --- a/pkgs/development/tools/norminette/default.nix +++ b/pkgs/development/tools/norminette/default.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { hash = "sha256-JpWziUKZPOD+AwiYeHR7e0B9l3XKNNp+XQkZEvynKGY="; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/ocaml/dune-release/default.nix b/pkgs/development/tools/ocaml/dune-release/default.nix index a2b4ddabafc..7e48203c091 100644 --- a/pkgs/development/tools/ocaml/dune-release/default.nix +++ b/pkgs/development/tools/ocaml/dune-release/default.nix @@ -23,7 +23,7 @@ in buildDunePackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ curly fmt cmdliner re opam-format opam-state opam-core rresult logs odoc bos yojson astring fpath ]; - checkInputs = [ alcotest ] ++ runtimeInputs; + nativeCheckInputs = [ alcotest ] ++ runtimeInputs; doCheck = true; postPatch = '' diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix index cf24a132210..551a36adaed 100644 --- a/pkgs/development/tools/ocaml/ocamlmod/default.nix +++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { installPhase = "ocaml setup.ml -install"; inherit doCheck; - checkInputs = [ ounit ]; + nativeCheckInputs = [ ounit ]; checkPhase = "ocaml setup.ml -test"; diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix index 298a68d3a42..3c2a0223dd4 100644 --- a/pkgs/development/tools/oq/default.nix +++ b/pkgs/development/tools/oq/default.nix @@ -19,7 +19,7 @@ crystal.buildCrystalPackage rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libxml2 ]; - checkInputs = [ jq ]; + nativeCheckInputs = [ jq ]; format = "shards"; diff --git a/pkgs/development/tools/packcc/default.nix b/pkgs/development/tools/packcc/default.nix index 77ad7315804..b16b0491c9b 100644 --- a/pkgs/development/tools/packcc/default.nix +++ b/pkgs/development/tools/packcc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bats uncrustify ]; + nativeCheckInputs = [ bats uncrustify ]; preCheck = '' patchShebangs ../../tests diff --git a/pkgs/development/tools/pip-audit/default.nix b/pkgs/development/tools/pip-audit/default.nix index 2baaf4f6a52..7d6e986ff13 100644 --- a/pkgs/development/tools/pip-audit/default.nix +++ b/pkgs/development/tools/pip-audit/default.nix @@ -52,7 +52,7 @@ buildPythonApplication rec { rich ]; - checkInputs = [ + nativeCheckInputs = [ pretend pytestCheckHook ]; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index f52bf6c0c92..80002ecdf78 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -71,7 +71,7 @@ let ) ); nativeBuildInputs = mkInput "nativeBuildInputs" [ ]; - checkInputs = mkInput "checkInputs" ( + nativeCheckInputs = mkInput "nativeCheckInputs" ( getDeps (pyProject.tool.poetry."dev-dependencies" or { }) # <poetry-1.2.0 # >=poetry-1.2.0 dependency groups ++ lib.flatten (map (g: getDeps (pyProject.tool.poetry.group.${g}.dependencies or { })) checkGroups) @@ -248,7 +248,7 @@ lib.makeScope pkgs.newScope (self: { } ) - # Fix infinite recursion in a lot of packages because of checkInputs + # Fix infinite recursion in a lot of packages because of nativeCheckInputs (self: super: lib.mapAttrs (name: value: ( if lib.isDerivation value && lib.hasAttr "overridePythonAttrs" value diff --git a/pkgs/development/tools/prospector/default.nix b/pkgs/development/tools/prospector/default.nix index 95b5512c6fc..7b81a1436f0 100644 --- a/pkgs/development/tools/prospector/default.nix +++ b/pkgs/development/tools/prospector/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { vulture ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix index 279f8101f78..0b7eca7e1de 100644 --- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix +++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ protobuf ]; + nativeCheckInputs = [ protobuf ]; checkPhase = '' runHook preCheck diff --git a/pkgs/development/tools/pur/default.nix b/pkgs/development/tools/pur/default.nix index d065b7b1351..710dc9e7141 100644 --- a/pkgs/development/tools/pur/default.nix +++ b/pkgs/development/tools/pur/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { python3.pkgs.click ]; - checkInputs = [ + nativeCheckInputs = [ python3.pkgs.pytestCheckHook ]; diff --git a/pkgs/development/tools/py-spy/default.nix b/pkgs/development/tools/py-spy/default.nix index 0ade6d722d1..676e3a8aff7 100644 --- a/pkgs/development/tools/py-spy/default.nix +++ b/pkgs/development/tools/py-spy/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { export RUSTFLAGS="-Clinker=$CC" ''; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; cargoSha256 = "sha256-DC+EfJ671/bvFoHHjpJlFCO/phdndNcldnP3DsIKqAg="; diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index d216ca4b916..d0b0000e59a 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { typing-extensions ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ attrs click colorama diff --git a/pkgs/development/tools/reno/default.nix b/pkgs/development/tools/reno/default.nix index ca01f6ebfa2..d0cb440ec40 100644 --- a/pkgs/development/tools/reno/default.nix +++ b/pkgs/development/tools/reno/default.nix @@ -21,7 +21,7 @@ with python3Packages; buildPythonApplication rec { setuptools # required for finding pkg_resources at runtime ]; - checkInputs = [ + nativeCheckInputs = [ # Python packages pytestCheckHook docutils diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix index 3a4cd640d95..95754d16502 100644 --- a/pkgs/development/tools/rust/bindgen/unwrapped.nix +++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix @@ -24,7 +24,7 @@ in rustPlatform.buildRustPackage rec { ''; doCheck = true; - checkInputs = [ clang ]; + nativeCheckInputs = [ clang ]; RUSTFMT = "${rustfmt-nightly}/bin/rustfmt"; diff --git a/pkgs/development/tools/rust/cargo-crev/default.nix b/pkgs/development/tools/rust/cargo-crev/default.nix index 5a47ce48268..55658c55448 100644 --- a/pkgs/development/tools/rust/cargo-crev/default.nix +++ b/pkgs/development/tools/rust/cargo-crev/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ SystemConfiguration Security CoreFoundation libiconv curl ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "A cryptographically verifiable code review system for the cargo (Rust) package manager"; diff --git a/pkgs/development/tools/rust/cargo-generate/default.nix b/pkgs/development/tools/rust/cargo-generate/default.nix index 4db3af1fff0..da90015752a 100644 --- a/pkgs/development/tools/rust/cargo-generate/default.nix +++ b/pkgs/development/tools/rust/cargo-generate/default.nix @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' export HOME=$(mktemp -d) USER=nixbld diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix index dc487953568..9653d4c556e 100644 --- a/pkgs/development/tools/rust/cargo-release/default.nix +++ b/pkgs/development/tools/rust/cargo-release/default.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 69307e80915..372f3687970 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - checkInputs = [ + nativeCheckInputs = [ python3Packages.cython ]; diff --git a/pkgs/development/tools/skjold/default.nix b/pkgs/development/tools/skjold/default.nix index 173de27d945..a8334a0a5ed 100644 --- a/pkgs/development/tools/skjold/default.nix +++ b/pkgs/development/tools/skjold/default.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec { toml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-mock pytest-watch pytestCheckHook diff --git a/pkgs/development/tools/vim-vint/default.nix b/pkgs/development/tools/vim-vint/default.nix index 5d48a7a3bab..f10c38539a2 100644 --- a/pkgs/development/tools/vim-vint/default.nix +++ b/pkgs/development/tools/vim-vint/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { # For python 3.5 > version > 2.7 , a nested dependency (pythonPackages.hypothesis) fails. disabled = ! pythonAtLeast "3.5"; - checkInputs = [ pytest pytest-cov ]; + nativeCheckInputs = [ pytest pytest-cov ]; propagatedBuildInputs = [ ansicolor chardet pyyaml setuptools ]; # Unpin test dependency versions. This is fixed in master but not yet released. diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index adc088baf21..7f9d8fae4c2 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl Security ]; - checkInputs = [ nodejs ]; + nativeCheckInputs = [ nodejs ]; # other tests require it to be ran in the wasm-bindgen monorepo cargoTestFlags = [ "--test=interface-types" ]; diff --git a/pkgs/development/tools/wasmedge/default.nix b/pkgs/development/tools/wasmedge/default.nix index 58b4b89ad9a..6f5d9162c5b 100644 --- a/pkgs/development/tools/wasmedge/default.nix +++ b/pkgs/development/tools/wasmedge/default.nix @@ -26,7 +26,7 @@ llvmPackages.stdenv.mkDerivation rec { nativeBuildInputs = [ cmake llvmPackages.lld ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" diff --git a/pkgs/development/tools/yamlpath/default.nix b/pkgs/development/tools/yamlpath/default.nix index 43434c65c40..2a2abf9cf01 100644 --- a/pkgs/development/tools/yamlpath/default.nix +++ b/pkgs/development/tools/yamlpath/default.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication rec { ruamel-yaml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ hiera-eyaml mock pytest-console-scripts |