From 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 Mon Sep 17 00:00:00 2001 From: Guillaume Girol Date: Sat, 21 Jan 2023 12:00:00 +0000 Subject: 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. --- pkgs/applications/version-management/blackbox/default.nix | 2 +- pkgs/applications/version-management/bump2version/default.nix | 2 +- pkgs/applications/version-management/bumpver/default.nix | 2 +- pkgs/applications/version-management/commitizen/default.nix | 2 +- pkgs/applications/version-management/conform/default.nix | 2 +- pkgs/applications/version-management/cvs2svn/default.nix | 2 +- pkgs/applications/version-management/delta/default.nix | 2 +- pkgs/applications/version-management/fast-export/default.nix | 2 +- pkgs/applications/version-management/gg/default.nix | 2 +- pkgs/applications/version-management/git-aggregator/default.nix | 2 +- pkgs/applications/version-management/git-bug-migration/default.nix | 2 +- pkgs/applications/version-management/git-codereview/default.nix | 2 +- .../version-management/git-delete-merged-branches/default.nix | 2 +- pkgs/applications/version-management/git-lfs/default.nix | 2 +- pkgs/applications/version-management/git-machete/default.nix | 2 +- pkgs/applications/version-management/git-nomad/default.nix | 2 +- pkgs/applications/version-management/git-privacy/default.nix | 2 +- pkgs/applications/version-management/git-remote-codecommit/default.nix | 2 +- pkgs/applications/version-management/git-town/default.nix | 2 +- pkgs/applications/version-management/git-up/default.nix | 2 +- pkgs/applications/version-management/gita/default.nix | 2 +- pkgs/applications/version-management/gitlint/default.nix | 2 +- pkgs/applications/version-management/gitstatus/default.nix | 2 +- pkgs/applications/version-management/glitter/default.nix | 2 +- pkgs/applications/version-management/hub/default.nix | 2 +- pkgs/applications/version-management/nbstripout/default.nix | 2 +- pkgs/applications/version-management/pass-git-helper/default.nix | 2 +- pkgs/applications/version-management/radicle-cli/default.nix | 2 +- pkgs/applications/version-management/sourcehut/todo.nix | 2 +- pkgs/applications/version-management/srvc/default.nix | 2 +- pkgs/applications/version-management/stgit/default.nix | 2 +- pkgs/applications/version-management/subversion/default.nix | 2 +- pkgs/applications/version-management/vcsh/default.nix | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) (limited to 'pkgs/applications/version-management') diff --git a/pkgs/applications/version-management/blackbox/default.nix b/pkgs/applications/version-management/blackbox/default.nix index 06a941de7b461..2b4b09fd2500f 100644 --- a/pkgs/applications/version-management/blackbox/default.nix +++ b/pkgs/applications/version-management/blackbox/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/134445 doCheck = !stdenv.isDarwin && stdenv.isx86_64; - checkInputs = [ + nativeCheckInputs = [ expect which coreutils diff --git a/pkgs/applications/version-management/bump2version/default.nix b/pkgs/applications/version-management/bump2version/default.nix index ffb9455bd19f9..86d1618cc48d4 100644 --- a/pkgs/applications/version-management/bump2version/default.nix +++ b/pkgs/applications/version-management/bump2version/default.nix @@ -19,7 +19,7 @@ buildPythonApplication rec { sha256 = "sha256-j6HKi3jTwSgGBrA8PCJJNg+yQqRMo1aqaLgPGf4KAKU="; }; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook testfixtures ]; diff --git a/pkgs/applications/version-management/bumpver/default.nix b/pkgs/applications/version-management/bumpver/default.nix index 756a031ae1e7f..d32e0154c8ae7 100644 --- a/pkgs/applications/version-management/bumpver/default.nix +++ b/pkgs/applications/version-management/bumpver/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ pathlib2 click toml lexid colorama setuptools ]; - checkInputs = [ python3.pkgs.pytestCheckHook git mercurial]; + nativeCheckInputs = [ python3.pkgs.pytestCheckHook git mercurial]; meta = with lib; { description = "Bump version numbers in project files"; diff --git a/pkgs/applications/version-management/commitizen/default.nix b/pkgs/applications/version-management/commitizen/default.nix index 7eea1e0eb30e5..f7ba075114b7f 100644 --- a/pkgs/applications/version-management/commitizen/default.nix +++ b/pkgs/applications/version-management/commitizen/default.nix @@ -60,7 +60,7 @@ buildPythonApplication rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ pre-commit py pytestCheckHook diff --git a/pkgs/applications/version-management/conform/default.nix b/pkgs/applications/version-management/conform/default.nix index 67741d55ceb22..5905b6e4d1ba4 100644 --- a/pkgs/applications/version-management/conform/default.nix +++ b/pkgs/applications/version-management/conform/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { "-X github.com/siderolabs/conform/internal/version.Tag=v${version}" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Policy enforcement for your pipelines"; diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix index a5903b7266e46..fe429fdb7afc9 100644 --- a/pkgs/applications/version-management/cvs2svn/default.nix +++ b/pkgs/applications/version-management/cvs2svn/default.nix @@ -15,7 +15,7 @@ pypy2Packages.buildPythonApplication rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - checkInputs = [ subversion git breezy ]; + nativeCheckInputs = [ subversion git breezy ]; checkPhase = "${pypy2Packages.python.interpreter} run-tests.py"; diff --git a/pkgs/applications/version-management/delta/default.nix b/pkgs/applications/version-management/delta/default.nix index 184a15d92c013..c02a9af2538ec 100644 --- a/pkgs/applications/version-management/delta/default.nix +++ b/pkgs/applications/version-management/delta/default.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation libiconv Security ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; postInstall = '' installShellCompletion --bash --name delta.bash etc/completion/completion.bash diff --git a/pkgs/applications/version-management/fast-export/default.nix b/pkgs/applications/version-management/fast-export/default.nix index 9d726795c6200..a4d9c030c9b49 100644 --- a/pkgs/applications/version-management/fast-export/default.nix +++ b/pkgs/applications/version-management/fast-export/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ''; doInstallCheck = true; - # deliberately not adding git or hg into installCheckInputs - package should + # deliberately not adding git or hg into nativeInstallCheckInputs - package should # be able to work without them in runtime env installCheckPhase = '' mkdir repo-hg diff --git a/pkgs/applications/version-management/gg/default.nix b/pkgs/applications/version-management/gg/default.nix index 032c461a74ce8..b94fea8da8582 100644 --- a/pkgs/applications/version-management/gg/default.nix +++ b/pkgs/applications/version-management/gg/default.nix @@ -36,7 +36,7 @@ in buildGoModule { vendorSha256 = "214dc073dad7b323ea449acf24c5b578d573432eeaa1506cf5761a2d7f5ce405"; nativeBuildInputs = [ pandoc installShellFiles makeWrapper ]; - checkInputs = [ bash coreutils git ]; + nativeCheckInputs = [ bash coreutils git ]; buildInputs = [ bash git ]; postInstall = '' diff --git a/pkgs/applications/version-management/git-aggregator/default.nix b/pkgs/applications/version-management/git-aggregator/default.nix index 9b2465366f672..3009edcb90a38 100644 --- a/pkgs/applications/version-management/git-aggregator/default.nix +++ b/pkgs/applications/version-management/git-aggregator/default.nix @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { requests ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/git-bug-migration/default.nix b/pkgs/applications/version-management/git-bug-migration/default.nix index 53c496ae009ae..36ddc93d839c5 100644 --- a/pkgs/applications/version-management/git-bug-migration/default.nix +++ b/pkgs/applications/version-management/git-bug-migration/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { vendorSha256 = "sha256-Hid9OK91LNjLmDHam0ZlrVQopVOsqbZ+BH2rfQi5lS0="; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; ldflags = [ "-X main.GitExactTag=${version}" diff --git a/pkgs/applications/version-management/git-codereview/default.nix b/pkgs/applications/version-management/git-codereview/default.nix index af641d241b849..90dcbdb0dddc3 100644 --- a/pkgs/applications/version-management/git-codereview/default.nix +++ b/pkgs/applications/version-management/git-codereview/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; meta = with lib; { description = "Manage the code review process for Git changes using a Gerrit server"; diff --git a/pkgs/applications/version-management/git-delete-merged-branches/default.nix b/pkgs/applications/version-management/git-delete-merged-branches/default.nix index dc9b251537ec8..08d93bcf69e7d 100644 --- a/pkgs/applications/version-management/git-delete-merged-branches/default.nix +++ b/pkgs/applications/version-management/git-delete-merged-branches/default.nix @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec { prompt-toolkit ]; - checkInputs = [ git ] + nativeCheckInputs = [ git ] ++ (with python3Packages; [ parameterized ]); meta = with lib; { diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index bbb7d29422aa7..4285c5be8a389 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -31,7 +31,7 @@ buildGoModule rec { make man ''; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = '' unset subPackages diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 0fd110dcc3f82..aae8144404232 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { nativeBuildInputs = [ installShellFiles ]; - checkInputs = [ + nativeCheckInputs = [ git pytest-mock pytestCheckHook diff --git a/pkgs/applications/version-management/git-nomad/default.nix b/pkgs/applications/version-management/git-nomad/default.nix index 50d2b117ba559..15534fc01bb36 100644 --- a/pkgs/applications/version-management/git-nomad/default.nix +++ b/pkgs/applications/version-management/git-nomad/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.SystemConfiguration ]; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/git-privacy/default.nix b/pkgs/applications/version-management/git-privacy/default.nix index d162f9ce20ba5..0a87793639d8e 100644 --- a/pkgs/applications/version-management/git-privacy/default.nix +++ b/pkgs/applications/version-management/git-privacy/default.nix @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication rec { setuptools ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ git pytestCheckHook ]; diff --git a/pkgs/applications/version-management/git-remote-codecommit/default.nix b/pkgs/applications/version-management/git-remote-codecommit/default.nix index 8ada5cc42f54e..f2b47af2e3828 100644 --- a/pkgs/applications/version-management/git-remote-codecommit/default.nix +++ b/pkgs/applications/version-management/git-remote-codecommit/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { propagatedBuildInputs = [ botocore ]; - checkInputs = [ pytest mock flake8 tox awscli ]; + nativeCheckInputs = [ pytest mock flake8 tox awscli ]; checkPhase = '' pytest diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index abca61358d99b..8a59fad46431b 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { "-X ${modulePath}/src/cmd.buildDate=nix" ]; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; preCheck = let skippedTests = [ diff --git a/pkgs/applications/version-management/git-up/default.nix b/pkgs/applications/version-management/git-up/default.nix index 71ae40e25d35b..308c04b05d603 100644 --- a/pkgs/applications/version-management/git-up/default.nix +++ b/pkgs/applications/version-management/git-up/default.nix @@ -24,7 +24,7 @@ pythonPackages.buildPythonApplication rec { termcolor ]); - checkInputs = [ git pythonPackages.nose ]; # git needs to be on path + nativeCheckInputs = [ git pythonPackages.nose ]; # git needs to be on path # 1. git fails to run as it cannot detect the email address, so we set it # 2. $HOME is by default not a valid dir, so we have to set that too # https://github.com/NixOS/nixpkgs/issues/12591 diff --git a/pkgs/applications/version-management/gita/default.nix b/pkgs/applications/version-management/gita/default.nix index 6f20e4a44c6fe..f2d9d2a9f66d1 100644 --- a/pkgs/applications/version-management/gita/default.nix +++ b/pkgs/applications/version-management/gita/default.nix @@ -33,7 +33,7 @@ buildPythonApplication rec { done ''; - checkInputs = [ + nativeCheckInputs = [ git pytest ]; diff --git a/pkgs/applications/version-management/gitlint/default.nix b/pkgs/applications/version-management/gitlint/default.nix index 626739864c713..6adb5bdc7a3f6 100644 --- a/pkgs/applications/version-management/gitlint/default.nix +++ b/pkgs/applications/version-management/gitlint/default.nix @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { sh ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ gitMinimal pytestCheckHook ]; diff --git a/pkgs/applications/version-management/gitstatus/default.nix b/pkgs/applications/version-management/gitstatus/default.nix index 4b669c27252e2..21e8bafcd0b35 100644 --- a/pkgs/applications/version-management/gitstatus/default.nix +++ b/pkgs/applications/version-management/gitstatus/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # that the script was sourced successfully and that the "gitstatus_query" # command ran successfully. This tests the binary itself and the zsh # integration. - installCheckInputs = [ git zsh ]; + nativeInstallCheckInputs = [ git zsh ]; doInstallCheck = true; installCheckPhase = '' TEMP=$(mktemp -d) diff --git a/pkgs/applications/version-management/glitter/default.nix b/pkgs/applications/version-management/glitter/default.nix index 5f2ac7fea8b4e..5786ebc8a6507 100644 --- a/pkgs/applications/version-management/glitter/default.nix +++ b/pkgs/applications/version-management/glitter/default.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-GQ7Bns+FPj4jl2dBXnMrmcKIYcZTLZc1WvaHgKGj/gU="; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/hub/default.nix b/pkgs/applications/version-management/hub/default.nix index cb75ec8264640..307bf0e6f408f 100644 --- a/pkgs/applications/version-management/hub/default.nix +++ b/pkgs/applications/version-management/hub/default.nix @@ -50,7 +50,7 @@ buildGoModule rec { --suffix PATH : ${lib.makeBinPath [ git ]} ''; - checkInputs = [ + nativeCheckInputs = [ git ]; diff --git a/pkgs/applications/version-management/nbstripout/default.nix b/pkgs/applications/version-management/nbstripout/default.nix index a201ce6ddbb46..e88f21a85cb15 100644 --- a/pkgs/applications/version-management/nbstripout/default.nix +++ b/pkgs/applications/version-management/nbstripout/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { nbformat ]; - checkInputs = [ + nativeCheckInputs = [ coreutils git mercurial diff --git a/pkgs/applications/version-management/pass-git-helper/default.nix b/pkgs/applications/version-management/pass-git-helper/default.nix index 63f7a459a70a5..7085e0c48f250 100644 --- a/pkgs/applications/version-management/pass-git-helper/default.nix +++ b/pkgs/applications/version-management/pass-git-helper/default.nix @@ -12,7 +12,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ pyxdg ]; - checkInputs = [ pytest pytest-mock ]; + nativeCheckInputs = [ pytest pytest-mock ]; preCheck = '' export HOME=$(mktemp -d) ''; diff --git a/pkgs/applications/version-management/radicle-cli/default.nix b/pkgs/applications/version-management/radicle-cli/default.nix index a8df056774a2a..f74ae1cf37a3b 100644 --- a/pkgs/applications/version-management/radicle-cli/default.nix +++ b/pkgs/applications/version-management/radicle-cli/default.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec { done ''; - checkInputs = [ openssh ]; + nativeCheckInputs = [ openssh ]; preCheck = '' eval $(ssh-agent) ''; diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index b6e4f8c33110f..95ef43775ec2c 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -52,7 +52,7 @@ buildPythonPackage rec { ''; # pytest tests fail - checkInputs = [ + nativeCheckInputs = [ pytest factory_boy ]; diff --git a/pkgs/applications/version-management/srvc/default.nix b/pkgs/applications/version-management/srvc/default.nix index 2c9fa57f0ab32..763c60f654bba 100644 --- a/pkgs/applications/version-management/srvc/default.nix +++ b/pkgs/applications/version-management/srvc/default.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { Security ]; - checkInputs = [ webfs ]; + nativeCheckInputs = [ webfs ]; # remove timeouts in tests to make them less flaky TEST_SRVC_DISABLE_TIMEOUT = 1; diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/stgit/default.nix index b5bdecd85ad16..535edeeff1529 100644 --- a/pkgs/applications/version-management/stgit/default.nix +++ b/pkgs/applications/version-management/stgit/default.nix @@ -26,7 +26,7 @@ python3Packages.buildPythonApplication rec { format = "other"; - checkInputs = [ git perl ]; + nativeCheckInputs = [ git perl ]; postPatch = '' for f in Documentation/*.xsl; do diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 69a2bce490606..613872721d204 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -101,7 +101,7 @@ let enableParallelBuilding = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = false; # fails 10 out of ~2300 tests meta = with lib; { diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index 1fa100591832d..0625d0a684e00 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ git ]; - checkInputs = [] + nativeCheckInputs = [] ++ (with perlPackages; [ perl ShellCommand TestMost ]); outputs = [ "out" "doc" "man" ]; -- cgit 1.4.1