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/tools | |
| parent | 25193e2732e178f701f517ca15ff802f03b29933 (diff) | |
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/tools')
200 files changed, 203 insertions, 203 deletions
diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix index 80b87cb2776d8..9f71ba2fc8dd1 100644 --- a/pkgs/tools/X11/alttab/default.nix +++ b/pkgs/tools/X11/alttab/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ coreutils procps python3Packages.xvfbwrapper diff --git a/pkgs/tools/X11/xlayoutdisplay/default.nix b/pkgs/tools/X11/xlayoutdisplay/default.nix index 590d71b8f4a3f..593b40a2ade79 100644 --- a/pkgs/tools/X11/xlayoutdisplay/default.nix +++ b/pkgs/tools/X11/xlayoutdisplay/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; [ libX11 libXrandr libXcursor boost ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = true; checkTarget = "gtest"; diff --git a/pkgs/tools/admin/aws-google-auth/default.nix b/pkgs/tools/admin/aws-google-auth/default.nix index aa1c77ef68e47..efbbe49a5b8d0 100644 --- a/pkgs/tools/admin/aws-google-auth/default.nix +++ b/pkgs/tools/admin/aws-google-auth/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { tzlocal ] ++ lib.optional withU2F python-u2flib-host; - checkInputs = [ + nativeCheckInputs = [ mock nose ]; diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 5b0f472a582d6..61d2e1ee1d8aa 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -57,7 +57,7 @@ with py.pkgs; buildPythonApplication rec { urllib3 ]; - checkInputs = [ + nativeCheckInputs = [ jsonschema mock pytestCheckHook diff --git a/pkgs/tools/admin/awslimitchecker/default.nix b/pkgs/tools/admin/awslimitchecker/default.nix index 54cf599422334..0a67e5a4e4e20 100644 --- a/pkgs/tools/admin/awslimitchecker/default.nix +++ b/pkgs/tools/admin/awslimitchecker/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { versionfinder ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun onetimepass pytestCheckHook diff --git a/pkgs/tools/admin/awslogs/default.nix b/pkgs/tools/admin/awslogs/default.nix index 2f60e414d74a3..af8f427fe2a2a 100644 --- a/pkgs/tools/admin/awslogs/default.nix +++ b/pkgs/tools/admin/awslogs/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { jmespath ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2e047120cf24b..b1411531abaeb 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -64,7 +64,7 @@ let --replace "cryptography>=3.2,<3.4" "cryptography" \ --replace "msal-extensions>=0.3.1,<0.4" "msal-extensions" ''; - checkInputs = with self; [ pytest ]; + nativeCheckInputs = with self; [ pytest ]; doCheck = stdenv.isLinux; # ignore tests that does network call, or assume powershell checkPhase = '' @@ -96,7 +96,7 @@ let portalocker ]; - checkInputs = [ py.pkgs.pytest ]; + nativeCheckInputs = [ py.pkgs.pytest ]; # ignore flaky test checkPhase = '' cd azure diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 576df67ad5fd0..87ad72ea4759c 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -49,7 +49,7 @@ in python.pkgs.buildPythonApplication rec { six ]; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/tools/admin/iredis/default.nix b/pkgs/tools/admin/iredis/default.nix index 86ec25ac2e777..805ba5d3d5edd 100644 --- a/pkgs/tools/admin/iredis/default.nix +++ b/pkgs/tools/admin/iredis/default.nix @@ -35,7 +35,7 @@ buildPythonApplication rec { wcwidth ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pexpect ]; diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index c060f600d3248..4faebec280618 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -39,7 +39,7 @@ buildPythonApplication rec { zeep ]; - checkInputs = [ + nativeCheckInputs = [ mock pytestCheckHook pytest-xdist diff --git a/pkgs/tools/admin/mycli/default.nix b/pkgs/tools/admin/mycli/default.nix index a068ce7dc9f0f..bf1ad3cfe47b5 100644 --- a/pkgs/tools/admin/mycli/default.nix +++ b/pkgs/tools/admin/mycli/default.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sqlparse ]; - checkInputs = [ pytest glibcLocales ]; + nativeCheckInputs = [ pytest glibcLocales ]; checkPhase = '' export HOME=. diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix index c599d6e0a9d1f..c5cad8f202a0c 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-nodejs.nix @@ -22,7 +22,7 @@ buildGoModule rec { "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ nodejs ]; diff --git a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix index 2f0810b04b839..e63e311fabec0 100644 --- a/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix +++ b/pkgs/tools/admin/pulumi-packages/pulumi-language-python.nix @@ -33,7 +33,7 @@ buildGoModule rec { "-X github.com/pulumi/pulumi/sdk/v3/go/common/version.Version=${version}" ]; - checkInputs = [ + nativeCheckInputs = [ python3 ]; diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index e95a265ebd6f4..367a11a9a4542 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -51,7 +51,7 @@ buildGoModule rec { "TestPendingDeleteOrder" ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix index 88b0e61477360..51e2fe98b0b49 100644 --- a/pkgs/tools/admin/simp_le/default.nix +++ b/pkgs/tools/admin/simp_le/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ acme setuptools-scm josepy idna ]; - checkInputs = with python3Packages; [ mock ]; + nativeCheckInputs = with python3Packages; [ mock ]; meta = with lib; { homepage = "https://github.com/zenhack/simp_le"; diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix index f26881d91c93a..4cfef4657e378 100644 --- a/pkgs/tools/audio/beets/common.nix +++ b/pkgs/tools/audio/beets/common.nix @@ -119,7 +119,7 @@ python3Packages.buildPythonApplication rec { "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytest mock rarfile diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix index 635854d4576a0..95740e2d4e423 100644 --- a/pkgs/tools/audio/beets/plugins/alternatives.nix +++ b/pkgs/tools/audio/beets/plugins/alternatives.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ beets ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook mock ]; diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix index 623ca2fcf1725..f2d65eb897e9c 100644 --- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix +++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { pytestFlagsArray = [ "-r fEs" ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook beets six diff --git a/pkgs/tools/audio/beets/plugins/extrafiles.nix b/pkgs/tools/audio/beets/plugins/extrafiles.nix index 7cd4c76d5045a..80c51dcde522f 100644 --- a/pkgs/tools/audio/beets/plugins/extrafiles.nix +++ b/pkgs/tools/audio/beets/plugins/extrafiles.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = with python3Packages; [ mediafile ]; - checkInputs = [ + nativeCheckInputs = [ python3Packages.pytestCheckHook beets ]; diff --git a/pkgs/tools/audio/spotdl/default.nix b/pkgs/tools/audio/spotdl/default.nix index 02628bf74ec12..c76dd693ad8d7 100644 --- a/pkgs/tools/audio/spotdl/default.nix +++ b/pkgs/tools/audio/spotdl/default.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication rec { platformdirs ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pytest-mock pytest-vcr diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 9b3bce6f44cfa..0a084498a96d7 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -106,7 +106,7 @@ python.pkgs.buildPythonApplication rec { ) ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ espeak-ng pytestCheckHook ]; diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 8489922f6c6db..f9dcc517521ab 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -81,7 +81,7 @@ python3.pkgs.buildPythonApplication rec { --zsh scripts/shell_completions/zsh/_borg ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ e2fsprogs py python-dateutil diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index bd41dd4854cb3..dc77b5de403ff 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-0o2tKg7BfhkNt/k8XdZ1agaSJxKO5OxB5aaRgV9IPeU="; }; - checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; + nativeCheckInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; # - test_borgmatic_version_matches_news_version # The file NEWS not available on the pypi source, and this test is useless diff --git a/pkgs/tools/backup/dedup/default.nix b/pkgs/tools/backup/dedup/default.nix index db7d24b7d85df..15daab4751e97 100644 --- a/pkgs/tools/backup/dedup/default.nix +++ b/pkgs/tools/backup/dedup/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ coreutils gawk ]; + nativeCheckInputs = [ coreutils gawk ]; checkTarget = "test"; meta = with lib; { diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index d6ab926c0caf2..cac9ae411d54e 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -78,7 +78,7 @@ pythonPackages.buildPythonApplication rec { future ]; - checkInputs = [ + nativeCheckInputs = [ gnupg # Add 'gpg' to PATH. gnutar # Add 'tar' to PATH. librsync # Add 'rdiff' to PATH. diff --git a/pkgs/tools/backup/gamerbackup/default.nix b/pkgs/tools/backup/gamerbackup/default.nix index dcdaafb4e54ff..a6e6246bb3394 100644 --- a/pkgs/tools/backup/gamerbackup/default.nix +++ b/pkgs/tools/backup/gamerbackup/default.nix @@ -15,7 +15,7 @@ buildGoModule { nativeBuildInputs = [ makeWrapper ]; - checkInputs = [ lepton ]; + nativeCheckInputs = [ lepton ]; postFixup = '' wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} diff --git a/pkgs/tools/backup/gphotos-sync/default.nix b/pkgs/tools/backup/gphotos-sync/default.nix index cdcc824c535de..c4464d3b76dba 100644 --- a/pkgs/tools/backup/gphotos-sync/default.nix +++ b/pkgs/tools/backup/gphotos-sync/default.nix @@ -59,7 +59,7 @@ py.pkgs.buildPythonApplication rec { ffmpeg ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ mock pytestCheckHook setuptools-scm diff --git a/pkgs/tools/backup/rotate-backups/default.nix b/pkgs/tools/backup/rotate-backups/default.nix index 405fc6c3955dd..d64b0dee50a83 100644 --- a/pkgs/tools/backup/rotate-backups/default.nix +++ b/pkgs/tools/backup/rotate-backups/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { update-dotdee ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix index 8bd51d613dc92..53836da125089 100644 --- a/pkgs/tools/backup/s3ql/default.nix +++ b/pkgs/tools/backup/s3ql/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "sha256-7N09b7JwMPliuyv2fEy1gQYaFCMSSvajOBPhNL3DQsg="; }; - checkInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); + nativeCheckInputs = [ which ] ++ (with python3Packages; [ cython pytest pytest-trio ]); propagatedBuildInputs = with python3Packages; [ sqlite apsw pycrypto requests defusedxml dugong google-auth google-auth-oauthlib trio pyfuse3 diff --git a/pkgs/tools/backup/tarsnapper/default.nix b/pkgs/tools/backup/tarsnapper/default.nix index d793017ad873d..447057448f87f 100644 --- a/pkgs/tools/backup/tarsnapper/default.nix +++ b/pkgs/tools/backup/tarsnapper/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { pexpect ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ nose ]; diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index fa2f69bb3ef5b..60a3d1b901204 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { sha256 = "b2cb9d4670a6e12d14a446c10d857862e91af6e4526f607e08b41bde89953bb8"; }; - checkInputs = [ + nativeCheckInputs = [ hypothesis mypy pytest diff --git a/pkgs/tools/compression/lziprecover/default.nix b/pkgs/tools/compression/lziprecover/default.nix index e322a19059017..38840a07092d2 100644 --- a/pkgs/tools/compression/lziprecover/default.nix +++ b/pkgs/tools/compression/lziprecover/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ lzip ]; + nativeCheckInputs = [ lzip ]; enableParallelBuilding = true; diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 5c04a943c10f5..6a489779cb02f 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { mkdir -p build_ && cd $_ ''; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; inherit doCheck; checkPhase = '' runHook preCheck diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index 30ffb2dd43f07..eb54f08a3a268 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { doCheck = false; # needs bcachefs module loaded on builder checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ]; - checkInputs = [ valgrind ]; + nativeCheckInputs = [ valgrind ]; preCheck = lib.optionalString fuseSupport '' rm tests/test_fuse.py diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 922586b323f5d..d9ec176220baf 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -98,7 +98,7 @@ let sourceRoot = "ceph-${version}/src/python-common"; - checkInputs = [ python.pkgs.pytest ]; + nativeCheckInputs = [ python.pkgs.pytest ]; propagatedBuildInputs = with python.pkgs; [ pyyaml six ]; meta = getMeta "Ceph common module for code shared by manager modules"; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 69dab5554ea62..47e58e1a59004 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost175 curl fuse openssl range-v3 spdlog ] ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - #checkInputs = [ gtest ]; + #nativeCheckInputs = [ gtest ]; cmakeFlags = [ "-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'" diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix index e15b4ad1f6450..db27a20d24a72 100644 --- a/pkgs/tools/filesystems/dosfstools/default.nix +++ b/pkgs/tools/filesystems/dosfstools/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-compat-symlinks" ]; - checkInputs = [ xxd ]; + nativeCheckInputs = [ xxd ]; doCheck = true; meta = { diff --git a/pkgs/tools/filesystems/dwarfs/default.nix b/pkgs/tools/filesystems/dwarfs/default.nix index 3427a5a688c31..1ffe03601dfe9 100644 --- a/pkgs/tools/filesystems/dwarfs/default.nix +++ b/pkgs/tools/filesystems/dwarfs/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; # this fails inside of the sandbox due to missing access # to the FUSE device GTEST_FILTER = "-tools.everything"; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index 0958bb2955b12..f08cb7a6c818f 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { "--enable-libuuid --disable-e2initrd-helper" ]; - checkInputs = [ buildPackages.perl ]; + nativeCheckInputs = [ buildPackages.perl ]; doCheck = true; postInstall = '' diff --git a/pkgs/tools/filesystems/gfs2-utils/default.nix b/pkgs/tools/filesystems/gfs2-utils/default.nix index 3f68888776cb2..6c33edbbfc921 100644 --- a/pkgs/tools/filesystems/gfs2-utils/default.nix +++ b/pkgs/tools/filesystems/gfs2-utils/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook bison flex pkg-config ]; buildInputs = [ bzip2 ncurses util-linux zlib ]; - checkInputs = [ check ]; + nativeCheckInputs = [ check ]; doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index b5b1256a9b5eb..f49f555983f30 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 'from pygit2 import RemoteCallbacks' ''; - checkInputs = with python3Packages; [ pytest pytest-cov mock ]; + nativeCheckInputs = with python3Packages; [ pytest pytest-cov mock ]; propagatedBuildInputs = with python3Packages; [ atomiclong fusepy pygit2 six ]; checkPhase = "py.test"; diff --git a/pkgs/tools/filesystems/sshfs-fuse/common.nix b/pkgs/tools/filesystems/sshfs-fuse/common.nix index 187efa1604e03..262c081e35079 100644 --- a/pkgs/tools/filesystems/sshfs-fuse/common.nix +++ b/pkgs/tools/filesystems/sshfs-fuse/common.nix @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson pkg-config ninja docutils makeWrapper ]; buildInputs = [ fuse glib ]; - checkInputs = [ which python3Packages.pytest ]; + nativeCheckInputs = [ which python3Packages.pytest ]; NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.system == "i686-linux") diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index c3051fb161279..b39e1e0125d56 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { packaging ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/tools/games/gamemode/default.nix b/pkgs/tools/games/gamemode/default.nix index e2aeea83776df..230ccb2ed5f26 100644 --- a/pkgs/tools/games/gamemode/default.nix +++ b/pkgs/tools/games/gamemode/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ]; doCheck = true; - checkInputs = [ + nativeCheckInputs = [ appstream ]; diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/tools/inputmethods/input-remapper/default.nix index 9137b834555dd..c69416076832a 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/tools/inputmethods/input-remapper/default.nix @@ -60,7 +60,7 @@ in ''; doCheck = withDoCheck; - checkInputs = [ + nativeCheckInputs = [ psutil ]; pythonImportsCheck = [ diff --git a/pkgs/tools/misc/asciinema/default.nix b/pkgs/tools/misc/asciinema/default.nix index e025b0ffc58e0..5cca96a455de0 100644 --- a/pkgs/tools/misc/asciinema/default.nix +++ b/pkgs/tools/misc/asciinema/default.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { --replace "python3" "${python3Packages.python}/bin/python" ''; - checkInputs = [ + nativeCheckInputs = [ glibcLocales python3Packages.nose ]; diff --git a/pkgs/tools/misc/barman/default.nix b/pkgs/tools/misc/barman/default.nix index 8e149838837b8..d7da86688616a 100644 --- a/pkgs/tools/misc/barman/default.nix +++ b/pkgs/tools/misc/barman/default.nix @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { ./unwrap-subprocess.patch ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock python-snappy google-cloud-storage diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix index d076cd1026f1c..791c6dbb05be6 100644 --- a/pkgs/tools/misc/bat-extras/default.nix +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -55,7 +55,7 @@ let # Run the library tests as they don't have external dependencies doCheck = true; - checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); checkPhase = '' runHook preCheck # test list repeats suites. Unique them @@ -112,7 +112,7 @@ let dontBuild = true; # we've already built doCheck = true; - checkInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); + nativeCheckInputs = [ bash fish zsh ] ++ (lib.optionals stdenv.isDarwin [ getconf ]); checkPhase = '' runHook preCheck bash ./test.sh --compiled --suite ${name} diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix index 69a784ec4cc36..cd2cac7684e8f 100644 --- a/pkgs/tools/misc/bepasty/default.nix +++ b/pkgs/tools/misc/bepasty/default.nix @@ -43,7 +43,7 @@ in with python.pkgs; buildPythonPackage rec { sha256 = "1y3smw9620w2ia4zfsl2svb9j7mkfgc8z1bzjffyk1w5vryhwikh"; }; - checkInputs = [ + nativeCheckInputs = [ pytest selenium ]; diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index 45a3b24ff02b8..85b630c9d67bc 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -25,7 +25,7 @@ python.pkgs.buildPythonApplication rec { --replace "requests==2.24.0" "requests>=2.24.0" ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 4fdb8ce7ab451..0a6a3178ece7d 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.GitSha=${src.rev}" ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; preCheck = '' pushd test/binaries/ diff --git a/pkgs/tools/misc/csvs-to-sqlite/default.nix b/pkgs/tools/misc/csvs-to-sqlite/default.nix index 736cc1c3dc5a3..d0f891fe54d29 100644 --- a/pkgs/tools/misc/csvs-to-sqlite/default.nix +++ b/pkgs/tools/misc/csvs-to-sqlite/default.nix @@ -37,7 +37,7 @@ in with python.pkgs; buildPythonApplication rec { six ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/czkawka/default.nix b/pkgs/tools/misc/czkawka/default.nix index 67ceb8fc37ff4..a81e078cdb350 100644 --- a/pkgs/tools/misc/czkawka/default.nix +++ b/pkgs/tools/misc/czkawka/default.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { gtk4 ]; - checkInputs = [ + nativeCheckInputs = [ xvfb-run ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1df7ef832b004..c5b90cbe8b78b 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec { hdf5 imagemagick libcaca llvm jdk mono ocaml odt2txt oggvideotools openssh pdftk poppler_utils procyon qemu R tcpdump ubootTools wabt radare2 xmlbeans ] ++ (with python3Packages; [ androguard binwalk guestfs h5py pdfminer-six ])); - checkInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ] ++ pythonPath; postInstall = '' make -C doc diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index a6b598a9cbb9b..b4b16198fcc4d 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -27,7 +27,7 @@ buildGoModule rec { make install PREFIX=$out ''; - checkInputs = [ fish zsh ]; + nativeCheckInputs = [ fish zsh ]; checkPhase = '' export HOME=$(mktemp -d) diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index af9972ca5f4b8..24611490c699a 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; passthru = { updateScript = nix-update-script { }; diff --git a/pkgs/tools/misc/dsq/default.nix b/pkgs/tools/misc/dsq/default.nix index 66cfdce990966..66d5544de88b3 100644 --- a/pkgs/tools/misc/dsq/default.nix +++ b/pkgs/tools/misc/dsq/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { ldflags = [ "-X" "main.Version=${version}" ]; - checkInputs = [ python3 curl jq p7zip ]; + nativeCheckInputs = [ python3 curl jq p7zip ]; preCheck = '' substituteInPlace scripts/test.py \ diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 9aaf184890df2..5a1f469f915a2 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -71,7 +71,7 @@ with python.pkgs; buildPythonApplication rec { "--set ESPHOME_USE_SUBPROCESS ''" ]; - checkInputs = [ + nativeCheckInputs = [ hypothesis mock pytest-asyncio diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix index cc6744b274f29..48131338c51d9 100644 --- a/pkgs/tools/misc/esptool/3.nix +++ b/pkgs/tools/misc/esptool/3.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication rec { done ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyelftools ]; diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 5feed7aa4a7d2..a62e266874d61 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { reedsolo ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyelftools pytest ]; diff --git a/pkgs/tools/misc/fwup/default.nix b/pkgs/tools/misc/fwup/default.nix index 9774896320239..f892250195170 100644 --- a/pkgs/tools/misc/fwup/default.nix +++ b/pkgs/tools/misc/fwup/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { dosfstools ]; - checkInputs = [ + nativeCheckInputs = [ which xdelta ]; diff --git a/pkgs/tools/misc/getoptions/default.nix b/pkgs/tools/misc/getoptions/default.nix index 364cf2aca822f..e3ee684d4dfa3 100644 --- a/pkgs/tools/misc/getoptions/default.nix +++ b/pkgs/tools/misc/getoptions/default.nix @@ -15,7 +15,7 @@ stdenvNoCC.mkDerivation rec { doCheck = true; - checkInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; + nativeCheckInputs = [ shellcheck shellspec busybox-sandbox-shell ksh mksh yash zsh ]; preCheck = '' sed -i '/shellspec -s posh/d' Makefile diff --git a/pkgs/tools/misc/gif-for-cli/default.nix b/pkgs/tools/misc/gif-for-cli/default.nix index bbb1b8b96402e..73a81acd65e48 100644 --- a/pkgs/tools/misc/gif-for-cli/default.nix +++ b/pkgs/tools/misc/gif-for-cli/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { sha256 = "Bl5o492BUAn1KsscnlMIXCzJuy7xWUsdnxIKZKaRM3M="; }; - checkInputs = [ python3Packages.coverage ]; + nativeCheckInputs = [ python3Packages.coverage ]; buildInputs = [ zlib libjpeg ]; propagatedBuildInputs = with python3Packages; [ ffmpeg pillow requests x256 ]; diff --git a/pkgs/tools/misc/gigalixir/default.nix b/pkgs/tools/misc/gigalixir/default.nix index c3710ca944871..708e9ad8141fa 100644 --- a/pkgs/tools/misc/gigalixir/default.nix +++ b/pkgs/tools/misc/gigalixir/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { stripe ]; - checkInputs = [ + nativeCheckInputs = [ git ] ++ (with python3.pkgs; [ httpretty diff --git a/pkgs/tools/misc/hid-tools/default.nix b/pkgs/tools/misc/hid-tools/default.nix index b69dbe4a27055..0d31ceea2dcf5 100644 --- a/pkgs/tools/misc/hid-tools/default.nix +++ b/pkgs/tools/misc/hid-tools/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonPackage rec { pyudev ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/lice/default.nix b/pkgs/tools/misc/lice/default.nix index 4cb3f794fd48c..59b2cef38ad0e 100644 --- a/pkgs/tools/misc/lice/default.nix +++ b/pkgs/tools/misc/lice/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ setuptools ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; meta = with lib; { description = "Print license based on selection and user options"; homepage = "https://github.com/licenses/lice"; diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 13246255d7ac9..2bdd49f672ffd 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ autoreconfHook groff makeWrapper pkg-config zstd ]; buildInputs = [ libpipeline db groff ]; # (Yes, 'groff' is both native and build input) - checkInputs = [ libiconv /* for 'iconv' binary */ ]; + nativeCheckInputs = [ libiconv /* for 'iconv' binary */ ]; patches = [ ./systemwide-man-db-conf.patch ]; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix index dc564776d893c..96c04c092b047 100644 --- a/pkgs/tools/misc/mandoc/default.nix +++ b/pkgs/tools/misc/mandoc/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "regress"; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; preCheck = "patchShebangs --build regress/regress.pl"; passthru.tests = { diff --git a/pkgs/tools/misc/ntfy/default.nix b/pkgs/tools/misc/ntfy/default.nix index bde0e734534a2..3e10f18173865 100644 --- a/pkgs/tools/misc/ntfy/default.nix +++ b/pkgs/tools/misc/ntfy/default.nix @@ -26,7 +26,7 @@ in python.pkgs.buildPythonApplication rec { sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv"; }; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ mock ]; diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 6e415461c4953..4a3887438f441 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; doCheck = true; - checkInputs = [ lua51Packages.busted util-linux neovim ]; + nativeCheckInputs = [ lua51Packages.busted util-linux neovim ]; # filter out one test that fails in the sandbox of nix checkPhase = '' runHook preCheck diff --git a/pkgs/tools/misc/onefetch/default.nix b/pkgs/tools/misc/onefetch/default.nix index cbdbf46d9c068..823606395ab9b 100644 --- a/pkgs/tools/misc/onefetch/default.nix +++ b/pkgs/tools/misc/onefetch/default.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zstd ] ++ lib.optionals stdenv.isDarwin [ CoreFoundation libresolv Security ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/misc/opentimestamps-client/default.nix b/pkgs/tools/misc/opentimestamps-client/default.nix index 93c10530697fd..2a5c2c05a0fbf 100644 --- a/pkgs/tools/misc/opentimestamps-client/default.nix +++ b/pkgs/tools/misc/opentimestamps-client/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { pysocks ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/parquet-tools/default.nix b/pkgs/tools/misc/parquet-tools/default.nix index d560c8b848986..5cb5d4f968034 100644 --- a/pkgs/tools/misc/parquet-tools/default.nix +++ b/pkgs/tools/misc/parquet-tools/default.nix @@ -49,7 +49,7 @@ buildPythonApplication rec { thrift ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook moto pytest-mock diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 35c82b630b7b7..f9f62854bbb3e 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Tests were previously failing due to Hydra running builds as uid 0. # That should hopefully be fixed now. doCheck = !stdenv.hostPlatform.isMusl; /* translation test */ - checkInputs = [ check dosfstools e2fsprogs perl python3 util-linux ]; + nativeCheckInputs = [ check dosfstools e2fsprogs perl python3 util-linux ]; meta = { description = "Create, destroy, resize, check, and copy partitions"; diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix index 3604e4ddcb4a7..cc4a400786241 100644 --- a/pkgs/tools/misc/past-time/default.nix +++ b/pkgs/tools/misc/past-time/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { tqdm ]; - checkInputs = [ + nativeCheckInputs = [ freezegun pytestCheckHook ]; diff --git a/pkgs/tools/misc/pgbadger/default.nix b/pkgs/tools/misc/pgbadger/default.nix index c7c4fd1f89b53..b0c4c1ad6551e 100644 --- a/pkgs/tools/misc/pgbadger/default.nix +++ b/pkgs/tools/misc/pgbadger/default.nix @@ -20,7 +20,7 @@ buildPerlPackage rec { buildInputs = [ PodMarkdown JSONXS TextCSV ]; - checkInputs = [ which bzip2 ]; + nativeCheckInputs = [ which bzip2 ]; meta = { homepage = "https://github.com/darold/pgbadger"; diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index a6100784a6b29..529a7db25b502 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-HiElAPgNeICEVbMBfK6syCoQb5smHhBH1MOuo2swci4="; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; preCheck = '' patchShebangs tests/editors/env-editor.py diff --git a/pkgs/tools/misc/pls/default.nix b/pkgs/tools/misc/pls/default.nix index 95c775417cb8a..c6d6d2e52835f 100644 --- a/pkgs/tools/misc/pls/default.nix +++ b/pkgs/tools/misc/pls/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { rich ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ freezegun jsonschema pytestCheckHook diff --git a/pkgs/tools/misc/pmbootstrap/default.nix b/pkgs/tools/misc/pmbootstrap/default.nix index fe2eb882c13ef..ab30518ffd897 100644 --- a/pkgs/tools/misc/pmbootstrap/default.nix +++ b/pkgs/tools/misc/pmbootstrap/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { # Tests depend on sudo doCheck = stdenv.isLinux; - checkInputs = [ pytestCheckHook git openssl ps sudo ]; + nativeCheckInputs = [ pytestCheckHook git openssl ps sudo ]; # Add test dependency in PATH preCheck = "export PYTHONPATH=$PYTHONPATH:${pmb_test}"; diff --git a/pkgs/tools/misc/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix index e694106a0eafc..8adb5a02f8c13 100644 --- a/pkgs/tools/misc/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { importlib-resources ]; - checkInputs = [ + nativeCheckInputs = [ cargo dotnet-sdk git diff --git a/pkgs/tools/misc/psrecord/default.nix b/pkgs/tools/misc/psrecord/default.nix index 728314e6e7697..2f2b14e4875a3 100644 --- a/pkgs/tools/misc/psrecord/default.nix +++ b/pkgs/tools/misc/psrecord/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { psutil matplotlib ]; - checkInputs = [ + nativeCheckInputs = [ pytest ]; diff --git a/pkgs/tools/misc/pubs/default.nix b/pkgs/tools/misc/pubs/default.nix index 81cb81829a420..4c52b9b239b46 100644 --- a/pkgs/tools/misc/pubs/default.nix +++ b/pkgs/tools/misc/pubs/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { argcomplete ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pyfakefs mock ddt diff --git a/pkgs/tools/misc/qmake2cmake/default.nix b/pkgs/tools/misc/qmake2cmake/default.nix index f9ff0dc6a7a12..b00d43a193a26 100644 --- a/pkgs/tools/misc/qmake2cmake/default.nix +++ b/pkgs/tools/misc/qmake2cmake/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { sympy ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index 0299cf3821815..4bd3ef131c11d 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { curl ]; - checkInputs = [ + nativeCheckInputs = [ bc check ]; diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 3688957af704f..5280943e994a2 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-hs0ImaozKH6QcUfts+oseUqecg7bGX5cx50ixnNamW8="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' HOME=$TMPDIR diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 893d9e390bf13..68d5eeaba2bdc 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pythonPaths = [ cryptography pyyaml requests ]; buildInputs = [ python perl python-dateutil setuptools ] ++ pythonPaths; nativeBuildInputs = [ gitMinimal zip makeWrapper ]; - checkInputs = [ nose pytest mock requests-mock ]; + nativeCheckInputs = [ nose pytest mock requests-mock ]; postPatch = '' substituteInPlace scripts/run-tests.sh \ diff --git a/pkgs/tools/misc/swaglyrics/default.nix b/pkgs/tools/misc/swaglyrics/default.nix index 8c5a3b7e9474b..730290f8cf389 100644 --- a/pkgs/tools/misc/swaglyrics/default.nix +++ b/pkgs/tools/misc/swaglyrics/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { unidecode ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ blinker flask flask-testing diff --git a/pkgs/tools/misc/thefuck/default.nix b/pkgs/tools/misc/thefuck/default.nix index 13f741c5444f2..8b9be06abb17f 100644 --- a/pkgs/tools/misc/thefuck/default.nix +++ b/pkgs/tools/misc/thefuck/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ colorama decorator psutil pyte six ]; - checkInputs = [ go mock pytestCheckHook pytest-mock ]; + nativeCheckInputs = [ go mock pytestCheckHook pytest-mock ]; disabledTests = lib.optionals stdenv.isDarwin [ "test_settings_defaults" diff --git a/pkgs/tools/misc/timelimit/default.nix b/pkgs/tools/misc/timelimit/default.nix index 22b71ca0f8f44..01de2c01c8782 100644 --- a/pkgs/tools/misc/timelimit/default.nix +++ b/pkgs/tools/misc/timelimit/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-5IEAF8zCKaCVH6BAxjoa/2rrue9pRGBBkFzN57d+g+g="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; doCheck = true; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/tlp/default.nix b/pkgs/tools/misc/tlp/default.nix index cbcc2ba38d212..4d1ff026f21ea 100644 --- a/pkgs/tools/misc/tlp/default.nix +++ b/pkgs/tools/misc/tlp/default.nix @@ -71,7 +71,7 @@ ++ lib.optionals enableRDW [ "install-rdw" "install-man-rdw" ]; doCheck = true; - checkInputs = [ checkbashisms perlcritic shellcheck ]; + nativeCheckInputs = [ checkbashisms perlcritic shellcheck ]; checkTarget = [ "checkall" ]; # TODO: Consider using resholve here diff --git a/pkgs/tools/misc/toybox/default.nix b/pkgs/tools/misc/toybox/default.nix index 508f0f4cee519..16f4d1eb55173 100644 --- a/pkgs/tools/misc/toybox/default.nix +++ b/pkgs/tools/misc/toybox/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { # ...this is fixed in latest git, so doCheck can likely be enabled for next release # see https://github.com/landley/toybox/commit/b928ec480cd73fd83511c0f5ca786d1b9f3167c3 #doCheck = true; - checkInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; + nativeCheckInputs = [ which ]; # used for tests with checkFlags = [ "DEBUG=true" ]; checkTarget = "tests"; NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix index fe79830d786ac..1ef54f05d7417 100644 --- a/pkgs/tools/misc/trash-cli/default.nix +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ psutil six ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ mock pytestCheckHook ]; diff --git a/pkgs/tools/misc/wayback-machine-archiver/default.nix b/pkgs/tools/misc/wayback-machine-archiver/default.nix index 986ca165ed246..71c0b63ad8e9e 100644 --- a/pkgs/tools/misc/wayback-machine-archiver/default.nix +++ b/pkgs/tools/misc/wayback-machine-archiver/default.nix @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ pypandoc ]; propagatedBuildInputs = with python3.pkgs; [ requests ]; - checkInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; postPatch = '' substituteInPlace setup.py \ diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 2e76719012e88..7adf01316d50b 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { twine ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index 47f3b1d298913..8db40b7c0b2e0 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { pythonPath = [ rtmpdump php wget ]; doCheck = false; # tests require network access - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; passthru.tests.version = testers.testVersion { package = yle-dl; diff --git a/pkgs/tools/misc/yubikey-manager/4.nix b/pkgs/tools/misc/yubikey-manager/4.nix index 5e0f0b1d92e34..6d653caeeb13b 100644 --- a/pkgs/tools/misc/yubikey-manager/4.nix +++ b/pkgs/tools/misc/yubikey-manager/4.nix @@ -59,7 +59,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - checkInputs = with python3Packages; [ pytestCheckHook makefun ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index fe64a2df37b29..730dfabe00f21 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonPackage rec { --replace 'compdef _ykman_completion ykman;' '_ykman_completion "$@"' ''; - checkInputs = with python3Packages; [ pytestCheckHook makefun ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook makefun ]; meta = with lib; { homepage = "https://developers.yubico.com/yubikey-manager"; diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index aede201ee91a4..ad4ac08564ae3 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index da55481cc439f..216d27eb4e124 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patchShebangs --build doc/manual-src/en/mkapiref.py ''; - checkInputs = [ cppunit ]; + nativeCheckInputs = [ cppunit ]; doCheck = false; # needs the net enableParallelBuilding = true; diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 1a3436c2c33db..28c3ce408021c 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -26,7 +26,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - checkInputs = lib.optionals stdenv.isDarwin [ ps ]; + nativeCheckInputs = lib.optionals stdenv.isDarwin [ ps ]; postInstall = '' wrapProgram "$out/bin/assh" \ diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index bab2ecbe619b6..06b04170a3f3b 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { tcp_wrappers ]; - checkInputs = [ + nativeCheckInputs = [ perl ps ]; diff --git a/pkgs/tools/networking/cantoolz/default.nix b/pkgs/tools/networking/cantoolz/default.nix index ca0d05131ca76..1f9308b741b4b 100644 --- a/pkgs/tools/networking/cantoolz/default.nix +++ b/pkgs/tools/networking/cantoolz/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { bitstring ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index c9aba8dc4e8be..9749378f714b8 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -26,7 +26,7 @@ buildPythonApplication rec { --replace "pyzmq>=13.1.0,<17.0" "pyzmq>13.1.0" ''; - checkInputs = [ mock ]; + nativeCheckInputs = [ mock ]; doCheck = false; # weird error diff --git a/pkgs/tools/networking/dcap/default.nix b/pkgs/tools/networking/dcap/default.nix index 3ee1a389ef946..3a19bf627a139 100644 --- a/pkgs/tools/networking/dcap/default.nix +++ b/pkgs/tools/networking/dcap/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ cunit ]; + nativeCheckInputs = [ cunit ]; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index b7ae9f00996aa..3d245abf3765d 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ parameterized pytestCheckHook ]; diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 225b208822a3a..3d15124b7d267 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { (fetchurl { url = "${p}/weed.at"; sha256 = "1101xakhc99f5gb9cs3mmydn43ayli7b270pzbvh7f9rbvh0d0nh"; }) ]; - checkInputs = [ dejagnu ]; + nativeCheckInputs = [ dejagnu ]; doCheck = false; # fails 1 out of a bunch of tests, looks like a bug doInstallCheck = false; # fails diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index cb768b8e95c45..01c70f3bf3f58 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ glib udev libgudev polkit ppp libmbim libqmi systemd ]; - installCheckInputs = [ + nativeInstallCheckInputs = [ python3 python3.pkgs.dbus-python python3.pkgs.pygobject3 ]; diff --git a/pkgs/tools/networking/nxdomain/default.nix b/pkgs/tools/networking/nxdomain/default.nix index 4e7a708125aad..a90c7f0c23ae6 100644 --- a/pkgs/tools/networking/nxdomain/default.nix +++ b/pkgs/tools/networking/nxdomain/default.nix @@ -11,7 +11,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ dnspython ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; postCheck = '' echo example.org > simple.list diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix index ebe2604f4e397..2f0b36f49728a 100644 --- a/pkgs/tools/networking/openssh/common.nix +++ b/pkgs/tools/networking/openssh/common.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { doCheck = true; enableParallelChecking = false; - checkInputs = optional (!stdenv.isDarwin) hostname; + nativeCheckInputs = optional (!stdenv.isDarwin) hostname; preCheck = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # construct a dummy HOME export HOME=$(realpath ../dummy-home) diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index a47483a11f339..620d953c88bce 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -66,7 +66,7 @@ python3Packages.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls ++ twisted.optional-dependencies.conch; - checkInputs = with python3Packages; [ mock hypothesis twisted ]; + nativeCheckInputs = with python3Packages; [ mock hypothesis twisted ]; # Install the documentation. postInstall = '' diff --git a/pkgs/tools/networking/ripe-atlas-tools/default.nix b/pkgs/tools/networking/ripe-atlas-tools/default.nix index 05f3ef22bd8c1..b425855480558 100644 --- a/pkgs/tools/networking/ripe-atlas-tools/default.nix +++ b/pkgs/tools/networking/ripe-atlas-tools/default.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication rec { "ripe.atlas.tools" ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/networking/socat/default.nix b/pkgs/tools/networking/socat/default.nix index 548d9bed76e40..aee97d1de58aa 100644 --- a/pkgs/tools/networking/socat/default.nix +++ b/pkgs/tools/networking/socat/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; - checkInputs = [ which nettools ]; + nativeCheckInputs = [ which nettools ]; doCheck = false; # fails a bunch, hangs meta = with lib; { diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 6726e5b751ab6..73ccdb43fef86 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchShebangs tests ''; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; buildInputs = [ libpcap ]; diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 3e42eaaaaf94a..96a71c1aba46e 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { sed -E '/CONFCMDLINE/ s;${storeDir}/[a-z0-9]{32}-;${storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-;g' -i config.h ''; - checkInputs = [ bison ]; + nativeCheckInputs = [ bison ]; doCheck = true; diff --git a/pkgs/tools/networking/wakeonlan/default.nix b/pkgs/tools/networking/wakeonlan/default.nix index 1a50f09d51c3c..80147ae39ce38 100644 --- a/pkgs/tools/networking/wakeonlan/default.nix +++ b/pkgs/tools/networking/wakeonlan/default.nix @@ -15,7 +15,7 @@ perlPackages.buildPerlPackage rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; + nativeCheckInputs = [ perlPackages.TestPerlCritic perlPackages.TestPod perlPackages.TestPodCoverage ]; # Linting and formatting checks are of no interest for us. preCheck = '' rm -f t/93_pod_spell.t diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index cfae235f4cb1f..90f663b0b4cc5 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication rec { pixiewps ]; - checkInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ]; + nativeCheckInputs = propagatedBuildInputs ++ [ python3.pkgs.unittestCheckHook ]; meta = with lib; { homepage = "https://github.com/kimocoder/wifite2"; diff --git a/pkgs/tools/networking/xdp-tools/default.nix b/pkgs/tools/networking/xdp-tools/default.nix index ffe60f6aa0fe7..12c0647bf4c56 100644 --- a/pkgs/tools/networking/xdp-tools/default.nix +++ b/pkgs/tools/networking/xdp-tools/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { emacs-nox # to generate man pages from .org nukeReferences ]; - checkInputs = [ + nativeCheckInputs = [ wireshark-cli # for tshark ]; diff --git a/pkgs/tools/networking/yrd/default.nix b/pkgs/tools/networking/yrd/default.nix index 1aace6aefbb5a..04fee4daf541b 100644 --- a/pkgs/tools/networking/yrd/default.nix +++ b/pkgs/tools/networking/yrd/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ nose ]; diff --git a/pkgs/tools/networking/ytcc/default.nix b/pkgs/tools/networking/ytcc/default.nix index 2a7c39879d39c..4cbcc3d48f2d8 100644 --- a/pkgs/tools/networking/ytcc/default.nix +++ b/pkgs/tools/networking/ytcc/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { wcwidth ]; - checkInputs = with python3Packages; [ nose pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ nose pytestCheckHook ]; # Disable tests that touch network or shell out to commands disabledTests = [ diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 898026a629028..151a53f15258e 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; inherit doCheck; - checkInputs = [ shellcheck ]; + nativeCheckInputs = [ shellcheck ]; checkPhase = '' shellcheck ./nix-info diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/tools/package-management/apkg/default.nix index 9f187724666dc..121f06ba89d22 100644 --- a/pkgs/tools/package-management/apkg/default.nix +++ b/pkgs/tools/package-management/apkg/default.nix @@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec { "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ]) ]; - checkInputs = with python3Packages; [ pytest ]; + nativeCheckInputs = with python3Packages; [ pytest ]; checkPhase = '' runHook preCheck py.test # inspiration: .gitlab-ci.yml diff --git a/pkgs/tools/package-management/appimagekit/default.nix b/pkgs/tools/package-management/appimagekit/default.nix index 151566ba8e8e2..556b96ea2095e 100644 --- a/pkgs/tools/package-management/appimagekit/default.nix +++ b/pkgs/tools/package-management/appimagekit/default.nix @@ -109,7 +109,7 @@ in stdenv.mkDerivation rec { --unset SOURCE_DATE_EPOCH ''; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; # for debugging passthru = { diff --git a/pkgs/tools/package-management/auditwheel/default.nix b/pkgs/tools/package-management/auditwheel/default.nix index b53ebff9c55c9..72d40cdfa5b90 100644 --- a/pkgs/tools/package-management/auditwheel/default.nix +++ b/pkgs/tools/package-management/auditwheel/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pretend pytestCheckHook ]; diff --git a/pkgs/tools/package-management/holo-build/default.nix b/pkgs/tools/package-management/holo-build/default.nix index 847c8a726d0f3..a6effa921bf35 100644 --- a/pkgs/tools/package-management/holo-build/default.nix +++ b/pkgs/tools/package-management/holo-build/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { make build/man/holo-build.8 VERSION=${version} ''; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; checkPhase = '' ln -s ../../go/bin/holo-build build/holo-build diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 3dee768b0b3c7..37b42e29bb14b 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-DX0jpp1ujaeesW7iQWZ5/xAzGndOQqBmQZbBpMEI9u0="; doCheck = true; - checkInputs = [ nix graphviz ]; + nativeCheckInputs = [ nix graphviz ]; buildInputs = [ boost diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix index 9af953d2365e7..dd11549663c9a 100644 --- a/pkgs/tools/package-management/pdm/default.nix +++ b/pkgs/tools/package-management/pdm/default.nix @@ -61,7 +61,7 @@ buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook pytest-mock pytest-xdist diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index f5ee82b786cef..c6f4c24ed718d 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -69,7 +69,7 @@ in python.pkgs.buildPythonApplication rec { rm $out/nix-support/propagated-build-inputs ''; - checkInputs = with python.pkgs; [ + nativeCheckInputs = with python.pkgs; [ cachy deepdiff flatdict diff --git a/pkgs/tools/package-management/poetry2conda/default.nix b/pkgs/tools/package-management/poetry2conda/default.nix index f69f28203196e..86e66def48680 100644 --- a/pkgs/tools/package-management/poetry2conda/default.nix +++ b/pkgs/tools/package-management/poetry2conda/default.nix @@ -32,7 +32,7 @@ with python3.pkgs; buildPythonApplication rec { toml ]; - checkInputs = [ + nativeCheckInputs = [ pytest-mock pytestCheckHook pyyaml diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 5084bc48fb77f..365d47bb0f748 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { ]}" ]; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; # From 1.6.0 release notes (https://github.com/Matoking/protontricks/releases/tag/1.6.0): # In most cases the script is unnecessary and should be removed as part of the packaging process. diff --git a/pkgs/tools/package-management/reuse/default.nix b/pkgs/tools/package-management/reuse/default.nix index 775b6da1707a1..130c9a42558e4 100644 --- a/pkgs/tools/package-management/reuse/default.nix +++ b/pkgs/tools/package-management/reuse/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { setuptools-scm ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; meta = with lib; { description = "A tool for compliance with the REUSE Initiative recommendations"; diff --git a/pkgs/tools/package-management/smlpkg/default.nix b/pkgs/tools/package-management/smlpkg/default.nix index b92ced4842a04..4bf75c1261496 100644 --- a/pkgs/tools/package-management/smlpkg/default.nix +++ b/pkgs/tools/package-management/smlpkg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ unzip ]; + nativeCheckInputs = [ unzip ]; # We cannot run the pkgtests, as Nix does not allow network # connections. diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index 79a0779e60a1d..c25db9e2d3987 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -105,7 +105,7 @@ let wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} ''; - installCheckInputs = [ perl file ]; + nativeInstallCheckInputs = [ perl file ]; doInstallCheck = true; installCheckPhase = '' # replace references to tools in build directory with references to installed locations diff --git a/pkgs/tools/security/amoco/default.nix b/pkgs/tools/security/amoco/default.nix index 88f614e4c9068..a9c182ca4cbc6 100644 --- a/pkgs/tools/security/amoco/default.nix +++ b/pkgs/tools/security/amoco/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { ]; }; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/atomic-operator/default.nix b/pkgs/tools/security/atomic-operator/default.nix index b385cce380612..6db7f0ecdd088 100644 --- a/pkgs/tools/security/atomic-operator/default.nix +++ b/pkgs/tools/security/atomic-operator/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { urllib3 ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index 220a372b2e9e6..dc0179fa35e54 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { tornado ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock netifaces pytest-bdd diff --git a/pkgs/tools/security/cfripper/default.nix b/pkgs/tools/security/cfripper/default.nix index 89a0188b0dcfa..da6c865dac60a 100644 --- a/pkgs/tools/security/cfripper/default.nix +++ b/pkgs/tools/security/cfripper/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ moto pytestCheckHook ]; diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 64a4946136f09..edb10f384bdf7 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -30,7 +30,7 @@ python3.pkgs.buildPythonApplication rec { nasm ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ distro pytestCheckHook ]; diff --git a/pkgs/tools/security/clairvoyance/default.nix b/pkgs/tools/security/clairvoyance/default.nix index fd7942bdd5d3a..2ffc101eb9832 100644 --- a/pkgs/tools/security/clairvoyance/default.nix +++ b/pkgs/tools/security/clairvoyance/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { aiohttp ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ aiounittest pytestCheckHook ]; diff --git a/pkgs/tools/security/credslayer/default.nix b/pkgs/tools/security/credslayer/default.nix index 67b0844f36147..c8e403f3b9e51 100644 --- a/pkgs/tools/security/credslayer/default.nix +++ b/pkgs/tools/security/credslayer/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pyshark ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ wireshark-cli pytestCheckHook ]; diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index d36c706e444f5..92405c20bb876 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -65,7 +65,7 @@ buildPythonApplication rec { packaging ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/tools/security/faraday-agent-dispatcher/default.nix b/pkgs/tools/security/faraday-agent-dispatcher/default.nix index 7b571380b3197..dc05255bc7ed5 100644 --- a/pkgs/tools/security/faraday-agent-dispatcher/default.nix +++ b/pkgs/tools/security/faraday-agent-dispatcher/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { websockets ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-asyncio pytestCheckHook ]; diff --git a/pkgs/tools/security/flare-floss/default.nix b/pkgs/tools/security/flare-floss/default.nix index 6416adec0ece2..c301a90a55679 100644 --- a/pkgs/tools/security/flare-floss/default.nix +++ b/pkgs/tools/security/flare-floss/default.nix @@ -55,7 +55,7 @@ py.pkgs.buildPythonPackage rec { vivisect ] ++ viv-utils.optional-dependencies.flirt; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytest-sugar pytestCheckHook pyyaml diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index 125cab6b3fd06..76b71e24aca60 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { libfprint ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gobject-introspection # for setup hook python-dbusmock dbus-python diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index 785f6aae9fffd..0f5051db0a4dd 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication rec { zstandard ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/gitjacker/default.nix b/pkgs/tools/security/gitjacker/default.nix index 14d9ab9ccfa21..05bdb2b17339c 100644 --- a/pkgs/tools/security/gitjacker/default.nix +++ b/pkgs/tools/security/gitjacker/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { propagatedBuildInputs = [ git ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/security/graphinder/default.nix b/pkgs/tools/security/graphinder/default.nix index ce9ccc7079caa..f0256dff7cbe3 100644 --- a/pkgs/tools/security/graphinder/default.nix +++ b/pkgs/tools/security/graphinder/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-asyncio pytest-mock pytestCheckHook diff --git a/pkgs/tools/security/grype/default.nix b/pkgs/tools/security/grype/default.nix index 862cde157a2f4..f745a2374ff32 100644 --- a/pkgs/tools/security/grype/default.nix +++ b/pkgs/tools/security/grype/default.nix @@ -55,7 +55,7 @@ buildGoModule rec { ldflags+=" -X github.com/anchore/grype/internal/version.buildDate=$(cat SOURCE_DATE_EPOCH)" ''; - checkInputs = [ openssl ]; + nativeCheckInputs = [ openssl ]; preCheck = '' # test all dirs (except excluded) unset subPackages diff --git a/pkgs/tools/security/ioccheck/default.nix b/pkgs/tools/security/ioccheck/default.nix index fb5c887a8bf91..be50d6483228a 100644 --- a/pkgs/tools/security/ioccheck/default.nix +++ b/pkgs/tools/security/ioccheck/default.nix @@ -66,7 +66,7 @@ buildPythonApplication rec { vt-py ]; - checkInputs = with py.pkgs; [ + nativeCheckInputs = with py.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index e082b3d217e8b..823f3db9b432e 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { kubernetes ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook requests-mock ]; diff --git a/pkgs/tools/security/lesspass-cli/default.nix b/pkgs/tools/security/lesspass-cli/default.nix index ce64b6847fe2a..a7b266c34ecef 100644 --- a/pkgs/tools/security/lesspass-cli/default.nix +++ b/pkgs/tools/security/lesspass-cli/default.nix @@ -24,7 +24,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ pytest mock pexpect ]; + nativeCheckInputs = [ pytest mock pexpect ]; checkPhase = '' mv lesspass lesspass.hidden # ensure we're testing against *installed* package pytest tests diff --git a/pkgs/tools/security/log4j-sniffer/default.nix b/pkgs/tools/security/log4j-sniffer/default.nix index d894e39d7faaf..72cf2fb851b3c 100644 --- a/pkgs/tools/security/log4j-sniffer/default.nix +++ b/pkgs/tools/security/log4j-sniffer/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorSha256 = null; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/security/log4shell-detector/default.nix b/pkgs/tools/security/log4shell-detector/default.nix index 6c51c5bcd6e9c..76fc657284385 100644 --- a/pkgs/tools/security/log4shell-detector/default.nix +++ b/pkgs/tools/security/log4shell-detector/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { zstandard ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/maigret/default.nix b/pkgs/tools/security/maigret/default.nix index 0b9b37225016c..a8d7f4c6b5321 100644 --- a/pkgs/tools/security/maigret/default.nix +++ b/pkgs/tools/security/maigret/default.nix @@ -57,7 +57,7 @@ python3.pkgs.buildPythonApplication rec { yarl ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-httpserver pytest-asyncio pytestCheckHook diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix index be9b2f8c28d26..0d3b287167120 100644 --- a/pkgs/tools/security/modsecurity/default.nix +++ b/pkgs/tools/security/modsecurity/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { patches = [ ./Makefile.am.patch ]; doCheck = true; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' mkdir -p $nginx diff --git a/pkgs/tools/security/mongoaudit/default.nix b/pkgs/tools/security/mongoaudit/default.nix index 4c15d1cfe9487..3ba19256ec34e 100644 --- a/pkgs/tools/security/mongoaudit/default.nix +++ b/pkgs/tools/security/mongoaudit/default.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication rec { urwid ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/offensive-azure/default.nix b/pkgs/tools/security/offensive-azure/default.nix index 78d254fbbca0d..fb5dce6798dcd 100644 --- a/pkgs/tools/security/offensive-azure/default.nix +++ b/pkgs/tools/security/offensive-azure/default.nix @@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index afb6d2e0dc318..c856c020d696f 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -145,7 +145,7 @@ stdenv.mkDerivation rec { doCheck = false; doInstallCheck = true; - installCheckInputs = [ git ]; + nativeInstallCheckInputs = [ git ]; installCheckTarget = "test"; passthru = { diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index c4c16b8ff8486..c9bbabd5fb2f8 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { # Tests freeze on darwin with: pass-audit-1.1 (checkPhase): EOFError doCheck = !stdenv.isDarwin; - checkInputs = [ pythonPackages.green pass gnupg ]; + nativeCheckInputs = [ pythonPackages.green pass gnupg ]; checkPhase = '' ${pythonEnv}/bin/python3 setup.py green -q ''; diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index d543ef9b25752..ad2d2a7156aeb 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication rec { secretstorage ]; - checkInputs = [ + nativeCheckInputs = [ gnupg pass python3Packages.pytestCheckHook diff --git a/pkgs/tools/security/radamsa/default.nix b/pkgs/tools/security/radamsa/default.nix index c8b084e1e3122..ebcd2a42191df 100644 --- a/pkgs/tools/security/radamsa/default.nix +++ b/pkgs/tools/security/radamsa/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=${placeholder "out"}" "BINDIR=" ]; - checkInputs = [ bash ]; + nativeCheckInputs = [ bash ]; doCheck = true; meta = { diff --git a/pkgs/tools/security/regexploit/default.nix b/pkgs/tools/security/regexploit/default.nix index be09c34254bb0..b921cbcc3b3c0 100644 --- a/pkgs/tools/security/regexploit/default.nix +++ b/pkgs/tools/security/regexploit/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/rng-tools/default.nix b/pkgs/tools/security/rng-tools/default.nix index 0795f84337207..d4fb4676e4aec 100644 --- a/pkgs/tools/security/rng-tools/default.nix +++ b/pkgs/tools/security/rng-tools/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { doCheck = true; preCheck = "patchShebangs tests/*.sh"; - checkInputs = [ psmisc ]; # rngtestjitter.sh needs killall + nativeCheckInputs = [ psmisc ]; # rngtestjitter.sh needs killall doInstallCheck = true; installCheckPhase = '' diff --git a/pkgs/tools/security/rnp/default.nix b/pkgs/tools/security/rnp/default.nix index 7d96c4f60e260..e7cb9d7637799 100644 --- a/pkgs/tools/security/rnp/default.nix +++ b/pkgs/tools/security/rnp/default.nix @@ -36,9 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ asciidoctor cmake gnupg gtest pkg-config python3 ]; - # NOTE: check-only inputs should ideally be moved to checkInputs, but it + # NOTE: check-only inputs should ideally be moved to nativeCheckInputs, but it # would fail during buildPhase. - # checkInputs = [ gtest python3 ]; + # nativeCheckInputs = [ gtest python3 ]; outputs = [ "out" "lib" "dev" ]; diff --git a/pkgs/tools/security/routersploit/default.nix b/pkgs/tools/security/routersploit/default.nix index e2a511c811b1e..e147e8feac0b4 100644 --- a/pkgs/tools/security/routersploit/default.nix +++ b/pkgs/tools/security/routersploit/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-xdist pytestCheckHook threat9-test-bed diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index 849a921898a7d..099e685fec036 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optional stdenv.isDarwin Security; - checkInputs = [ perl python3 ]; + nativeCheckInputs = [ perl python3 ]; # these tests require network access checkFlags = [ diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index 5a3ab9cb68b4f..aad2873d4aca0 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { doCheck = true; checkTarget = "test"; - checkInputs = lib.optionals stdenv.isLinux [ util-linux ]; + nativeCheckInputs = lib.optionals stdenv.isLinux [ util-linux ]; meta = with lib; { description = "Encryption utility"; diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index c97d877b483e9..8a2b8f0273ffa 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -64,7 +64,7 @@ buildPythonApplication rec { ]; doCheck = true; - checkInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ + nativeCheckInputs = [ git pytestCheckHook ] ++ (with pythonPackages; [ pytest-snapshot pytest-mock pytest-freezegun diff --git a/pkgs/tools/security/sequoia/default.nix b/pkgs/tools/security/sequoia/default.nix index edeaec56daf2d..f7f63f126bedd 100644 --- a/pkgs/tools/security/sequoia/default.nix +++ b/pkgs/tools/security/sequoia/default.nix @@ -58,7 +58,7 @@ rustPlatform.buildRustPackage rec { lib.optionals pythonSupport [ pythonPackages.setuptools ] ; - checkInputs = lib.optionals pythonSupport [ + nativeCheckInputs = lib.optionals pythonSupport [ pythonPackages.pytest pythonPackages.pytest-runner ]; diff --git a/pkgs/tools/security/sigma-cli/default.nix b/pkgs/tools/security/sigma-cli/default.nix index c0a21ef5440ab..d039234f37c9c 100644 --- a/pkgs/tools/security/sigma-cli/default.nix +++ b/pkgs/tools/security/sigma-cli/default.nix @@ -33,7 +33,7 @@ python3.pkgs.buildPythonApplication rec { pysigma-pipeline-windows ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/snallygaster/default.nix b/pkgs/tools/security/snallygaster/default.nix index e469e4b004e62..2f7f5d12192aa 100644 --- a/pkgs/tools/security/snallygaster/default.nix +++ b/pkgs/tools/security/snallygaster/default.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { dnspython ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/ssh-audit/default.nix b/pkgs/tools/security/ssh-audit/default.nix index 34d39390b4384..8a2ad022cef1d 100644 --- a/pkgs/tools/security/ssh-audit/default.nix +++ b/pkgs/tools/security/ssh-audit/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "0ks1zr0ksma285sm2dyy0nsbrkpssdk4mdzc3srr4mcyd6v927jd"; }; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/ssh-to-pgp/default.nix b/pkgs/tools/security/ssh-to-pgp/default.nix index fc07714b55b06..1d364fb0ad71e 100644 --- a/pkgs/tools/security/ssh-to-pgp/default.nix +++ b/pkgs/tools/security/ssh-to-pgp/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-OMWiJ1n8ynvIGcmotjuGGsRuAidYgVo5Y5JjrAw8fpc="; - checkInputs = [ gnupg ]; + nativeCheckInputs = [ gnupg ]; checkPhase = '' HOME=$TMPDIR go test . ''; diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix index 686e9eeffc693..f109886c9ca8e 100644 --- a/pkgs/tools/security/sshuttle/default.nix +++ b/pkgs/tools/security/sshuttle/default.nix @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - checkInputs = with python3Packages; [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; postInstall = '' wrapProgram $out/bin/sshuttle \ diff --git a/pkgs/tools/security/stacs/default.nix b/pkgs/tools/security/stacs/default.nix index 352c217b76a4b..672cd082849cf 100644 --- a/pkgs/tools/security/stacs/default.nix +++ b/pkgs/tools/security/stacs/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { yara-python ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 635fccc006325..e71b88c8c3b9a 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { autoreconfHook ]; - checkInputs = [ + nativeCheckInputs = [ which ]; diff --git a/pkgs/tools/security/theharvester/default.nix b/pkgs/tools/security/theharvester/default.nix index a78d9a23c1879..b267cab354a02 100644 --- a/pkgs/tools/security/theharvester/default.nix +++ b/pkgs/tools/security/theharvester/default.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication rec { uvloop ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest pytest-asyncio ]; diff --git a/pkgs/tools/security/tpm2-abrmd/default.nix b/pkgs/tools/security/tpm2-abrmd/default.nix index b3efb6c542e9d..cd3504b45f4cc 100644 --- a/pkgs/tools/security/tpm2-abrmd/default.nix +++ b/pkgs/tools/security/tpm2-abrmd/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config makeWrapper autoreconfHook autoconf-archive which ]; buildInputs = [ tpm2-tss glib dbus ]; - checkInputs = [ cmocka ]; + nativeCheckInputs = [ cmocka ]; enableParallelBuilding = true; diff --git a/pkgs/tools/security/uddup/default.nix b/pkgs/tools/security/uddup/default.nix index 5cde218bacfea..3516b4dcff8d5 100644 --- a/pkgs/tools/security/uddup/default.nix +++ b/pkgs/tools/security/uddup/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { colorama ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; diff --git a/pkgs/tools/security/vulnix/default.nix b/pkgs/tools/security/vulnix/default.nix index c3eb53c3b2075..a698a0a1527ed 100644 --- a/pkgs/tools/security/vulnix/default.nix +++ b/pkgs/tools/security/vulnix/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; nativeBuildInputs = [ ronn ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ freezegun pytest pytest-cov diff --git a/pkgs/tools/security/wad/default.nix b/pkgs/tools/security/wad/default.nix index 9b284a42a0186..5dc81a7f56df9 100644 --- a/pkgs/tools/security/wad/default.nix +++ b/pkgs/tools/security/wad/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { six ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock pytestCheckHook ]; diff --git a/pkgs/tools/security/wapiti/default.nix b/pkgs/tools/security/wapiti/default.nix index 4769db4816efd..6aec3dd105f28 100644 --- a/pkgs/tools/security/wapiti/default.nix +++ b/pkgs/tools/security/wapiti/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { ] ++ httpx.optional-dependencies.brotli ++ httpx.optional-dependencies.socks; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ respx pytest-asyncio pytestCheckHook diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 66d2172965655..c7e25e5785208 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = [ python3Packages.setuptools ]; - checkInputs = with python3Packages; [ jinja2 pytest mock coverage ]; + nativeCheckInputs = with python3Packages; [ jinja2 pytest mock coverage ]; # missing plugins doCheck = false; diff --git a/pkgs/tools/system/journalwatch/default.nix b/pkgs/tools/system/journalwatch/default.nix index 3d85d13149c3c..01324b65f6bb1 100644 --- a/pkgs/tools/system/journalwatch/default.nix +++ b/pkgs/tools/system/journalwatch/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { doCheck = true; - checkInputs = [ pytest ]; + nativeCheckInputs = [ pytest ]; checkPhase = '' pytest ''; diff --git a/pkgs/tools/text/csvkit/default.nix b/pkgs/tools/text/csvkit/default.nix index 56f5bae3123dc..922a66a9e1d40 100644 --- a/pkgs/tools/text/csvkit/default.nix +++ b/pkgs/tools/text/csvkit/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ nose pytestCheckHook ]; diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix index 1d3f14ea336ea..d15d5ce75f413 100644 --- a/pkgs/tools/text/gawk/gawkextlib.nix +++ b/pkgs/tools/text/gawk/gawkextlib.nix @@ -38,7 +38,7 @@ let inherit gawk; inherit doCheck; - checkInputs = [ more ]; + nativeCheckInputs = [ more ]; meta = with lib; { homepage = "https://sourceforge.net/projects/gawkextlib/"; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 8d8fa7d0a8baf..f4cb20202f0b1 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ]; doCheck = stdenv.hostPlatform.libc != "musl"; # not cross; - checkInputs = [ed]; + nativeCheckInputs = [ed]; meta = { description = "GNU Patch, a program to apply differences to files"; diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index c65a05c2a73c7..b81ff214124c8 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - checkInputs = [ gawk ]; + nativeCheckInputs = [ gawk ]; postPatch = '' substituteInPlace goawk_test.go \ diff --git a/pkgs/tools/text/icdiff/default.nix b/pkgs/tools/text/icdiff/default.nix index 715a4dbaae2af..1ab884b12d4db 100644 --- a/pkgs/tools/text/icdiff/default.nix +++ b/pkgs/tools/text/icdiff/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { sha256 = "080v8h09pv8qwplin4kwfm0kmqjwdqjfxbpcdrv16sv4hwfwl5qd"; }; - checkInputs = [ + nativeCheckInputs = [ bash git less diff --git a/pkgs/tools/text/mdbook-graphviz/default.nix b/pkgs/tools/text/mdbook-graphviz/default.nix index ec683072e1a78..529009fa616b4 100644 --- a/pkgs/tools/text/mdbook-graphviz/default.nix +++ b/pkgs/tools/text/mdbook-graphviz/default.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; - checkInputs = [ graphviz ]; + nativeCheckInputs = [ graphviz ]; meta = with lib; { description = "A preprocessor for mdbook, rendering Graphviz graphs to HTML at build time."; diff --git a/pkgs/tools/text/mdcat/default.nix b/pkgs/tools/text/mdcat/default.nix index b0221745026e8..47f74684c6f10 100644 --- a/pkgs/tools/text/mdcat/default.nix +++ b/pkgs/tools/text/mdcat/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-qpmzg1pmR4zv6wmwPB2ysgGU4v/QebpwKFpjbszEb/Q="; - checkInputs = [ ansi2html ]; + nativeCheckInputs = [ ansi2html ]; # Skip tests that use the network and that include files. checkFlags = [ "--skip magic::tests::detect_mimetype_of_larger_than_magic_param_bytes_max_length" diff --git a/pkgs/tools/text/tab/default.nix b/pkgs/tools/text/tab/default.nix index b70171e2908c5..0802f7b983612 100644 --- a/pkgs/tools/text/tab/default.nix +++ b/pkgs/tools/text/tab/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-AhgWeV/ojB8jM16A5ggrOD1YjWfRVcoQbkd3S2bgdyE="; }; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = !stdenv.isDarwin; diff --git a/pkgs/tools/text/teip/default.nix b/pkgs/tools/text/teip/default.nix index 2b069179965f5..14e1914dea8fe 100644 --- a/pkgs/tools/text/teip/default.nix +++ b/pkgs/tools/text/teip/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; postInstall = '' installManPage man/teip.1 diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index 510cf18369e60..d6ed960cce1e7 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; strictDeps = true; diff --git a/pkgs/tools/text/zim-tools/default.nix b/pkgs/tools/text/zim-tools/default.nix index 319eb47be2713..06c71b05c08a2 100644 --- a/pkgs/tools/text/zim-tools/default.nix +++ b/pkgs/tools/text/zim-tools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ docopt_cpp file gumbo mustache-hpp zimlib zlib ]; - checkInputs = [ gtest ]; + nativeCheckInputs = [ gtest ]; doCheck = true; meta = { diff --git a/pkgs/tools/text/zoekt/default.nix b/pkgs/tools/text/zoekt/default.nix index 1c14c4fa5bba4..9710932cde69a 100644 --- a/pkgs/tools/text/zoekt/default.nix +++ b/pkgs/tools/text/zoekt/default.nix @@ -16,7 +16,7 @@ buildGoModule { vendorHash = "sha256-DiAqFJ8E5V0/eHztm92WVrf1XGPXmmOaVXaWHfQMn2k="; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix index 4cfecfccdbcec..5e80158d90578 100644 --- a/pkgs/tools/typesetting/asciidoc/default.nix +++ b/pkgs/tools/typesetting/asciidoc/default.nix @@ -253,7 +253,7 @@ in python3.pkgs.buildPythonApplication rec { installManPage doc/asciidoc.1 doc/a2x.1 doc/testasciidoc.1 ''; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest pytest-mock ]; diff --git a/pkgs/tools/typesetting/rfc-bibtex/default.nix b/pkgs/tools/typesetting/rfc-bibtex/default.nix index de38b4cd29c26..a748983222efb 100644 --- a/pkgs/tools/typesetting/rfc-bibtex/default.nix +++ b/pkgs/tools/typesetting/rfc-bibtex/default.nix @@ -15,7 +15,7 @@ with python3.pkgs; buildPythonApplication rec { hash = "sha256-bPCNQqiG50vWVFA6J2kyxftwsXunHTNBdSkoIRYkb0s="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook vcrpy ]; diff --git a/pkgs/tools/virtualization/awsebcli/default.nix b/pkgs/tools/virtualization/awsebcli/default.nix index af784bce98174..25841ae92b49c 100644 --- a/pkgs/tools/virtualization/awsebcli/default.nix +++ b/pkgs/tools/virtualization/awsebcli/default.nix @@ -61,7 +61,7 @@ with localPython.pkgs; buildPythonApplication rec { LC_ALL = "en_US.UTF-8"; - checkInputs = [ + nativeCheckInputs = [ pytest mock nose diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix index 4b5f335938bbe..40e3bfd5c1bd0 100644 --- a/pkgs/tools/virtualization/cloud-init/default.nix +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -60,7 +60,7 @@ python3.pkgs.buildPythonApplication rec { requests ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook httpretty dmidecode diff --git a/pkgs/tools/virtualization/udocker/default.nix b/pkgs/tools/virtualization/udocker/default.nix index a209984776705..4fbccf813f2f3 100644 --- a/pkgs/tools/virtualization/udocker/default.nix +++ b/pkgs/tools/virtualization/udocker/default.nix @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication rec { }) ]; - checkInputs = with python3Packages; [ + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; |