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/shells/fish | |
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/shells/fish')
-rw-r--r-- | pkgs/shells/fish/default.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/bass.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/build-fish-plugin.nix | 6 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/fzf-fish.nix | 2 | ||||
-rw-r--r-- | pkgs/shells/fish/plugins/pure.nix | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 7c9d90aa01a11..a24a38081afe2 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -227,7 +227,7 @@ let doCheck = true; - checkInputs = [ + nativeCheckInputs = [ coreutils (python3.withPackages (ps: [ ps.pexpect ])) procps diff --git a/pkgs/shells/fish/plugins/bass.nix b/pkgs/shells/fish/plugins/bass.nix index db2907bddf409..35b36e29d5448 100644 --- a/pkgs/shells/fish/plugins/bass.nix +++ b/pkgs/shells/fish/plugins/bass.nix @@ -16,7 +16,7 @@ buildFishPlugin rec { cp functions/__bass.py $out/share/fish/vendor_functions.d/ ''; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; checkPhase = '' make test ''; diff --git a/pkgs/shells/fish/plugins/build-fish-plugin.nix b/pkgs/shells/fish/plugins/build-fish-plugin.nix index 5bb4ffa243fcd..b5d813133c5b0 100644 --- a/pkgs/shells/fish/plugins/build-fish-plugin.nix +++ b/pkgs/shells/fish/plugins/build-fish-plugin.nix @@ -12,7 +12,7 @@ attrs@{ preInstall ? "", postInstall ? "", - checkInputs ? [], + nativeCheckInputs ? [], # plugin packages to add to the vendor paths of the test fish shell checkPlugins ? [], # vendor directories to add to the function path of the test fish shell @@ -61,10 +61,10 @@ stdenv.mkDerivation (drvAttrs // { inherit doCheck; - checkInputs = [ (wrapFish { + nativeCheckInputs = [ (wrapFish { pluginPkgs = checkPlugins; functionDirs = checkFunctionDirs; - }) ] ++ checkInputs; + }) ] ++ nativeCheckInputs; checkPhase = '' export HOME=$(mktemp -d) # fish wants a writable home diff --git a/pkgs/shells/fish/plugins/fzf-fish.nix b/pkgs/shells/fish/plugins/fzf-fish.nix index 5f55808cb5142..2480b9ea93cbe 100644 --- a/pkgs/shells/fish/plugins/fzf-fish.nix +++ b/pkgs/shells/fish/plugins/fzf-fish.nix @@ -11,7 +11,7 @@ buildFishPlugin rec { sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s="; }; - checkInputs = [ fzf fd util-linux ]; + nativeCheckInputs = [ fzf fd util-linux ]; checkPlugins = [ clownfish fishtape_3 ]; checkFunctionDirs = [ "./functions" ]; checkPhase = '' diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix index 68da97633c4f7..dae5cf783010f 100644 --- a/pkgs/shells/fish/plugins/pure.nix +++ b/pkgs/shells/fish/plugins/pure.nix @@ -19,7 +19,7 @@ buildFishPlugin rec { # and https://github.com/pure-fish/pure/pull/275. doCheck = false; - checkInputs = [ git ]; + nativeCheckInputs = [ git ]; checkPlugins = [ fishtape ]; checkPhase = '' # https://github.com/rafaelrinaldi/pure/issues/264 |