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/applications/science | |
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/applications/science')
25 files changed, 25 insertions, 25 deletions
diff --git a/pkgs/applications/science/biology/deeptools/default.nix b/pkgs/applications/science/biology/deeptools/default.nix index 1739a4c999a44..eaf0b59327260 100644 --- a/pkgs/applications/science/biology/deeptools/default.nix +++ b/pkgs/applications/science/biology/deeptools/default.nix @@ -23,7 +23,7 @@ buildPythonApplication rec { deeptoolsintervals ]; - checkInputs = [ nose ]; + nativeCheckInputs = [ nose ]; meta = with lib; { homepage = "https://deeptools.readthedocs.io/en/develop"; diff --git a/pkgs/applications/science/biology/genmap/default.nix b/pkgs/applications/science/biology/genmap/default.nix index c2d1b8da7af12..c6f9cf1fb1932 100644 --- a/pkgs/applications/science/biology/genmap/default.nix +++ b/pkgs/applications/science/biology/genmap/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; patches = [ ./gtest.patch ]; - checkInputs = [ gtest which ]; + nativeCheckInputs = [ gtest which ]; preCheck = "make genmap_algo_test"; # disable benchmarks diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 99b6269737d1e..4cb130296aeca 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { qt5.qtsvg ]; - installCheckInputs = [ bc ]; + nativeInstallCheckInputs = [ bc ]; postPatch = '' patchShebangs ./build ./configure ./run_tests ./bin/* diff --git a/pkgs/applications/science/biology/samtools/default.nix b/pkgs/applications/science/biology/samtools/default.nix index 41129a667e914..c72dd1b19077d 100644 --- a/pkgs/applications/science/biology/samtools/default.nix +++ b/pkgs/applications/science/biology/samtools/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ]; # tests require `bgzip` from the htslib package - checkInputs = [ htslib ]; + nativeCheckInputs = [ htslib ]; nativeBuildInputs = [ perl ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 0a190a1c90294..33d145c007566 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ perl ]; nativeBuildInputs = [ flex bison python3 autoconf ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; doCheck = stdenv.isLinux; # darwin tests are broken for now... checkTarget = "test"; diff --git a/pkgs/applications/science/electronics/verilog/default.nix b/pkgs/applications/science/electronics/verilog/default.nix index 4994a1db7b2a2..994ecb8c13149 100644 --- a/pkgs/applications/science/electronics/verilog/default.nix +++ b/pkgs/applications/science/electronics/verilog/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - installCheckInputs = [ perl ]; + nativeInstallCheckInputs = [ perl ]; installCheckPhase = '' # copy tests to allow writing results diff --git a/pkgs/applications/science/electronics/xyce/default.nix b/pkgs/applications/science/electronics/xyce/default.nix index 2c52916bd9059..06872eae740f0 100644 --- a/pkgs/applications/science/electronics/xyce/default.nix +++ b/pkgs/applications/science/electronics/xyce/default.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { popd ''; - checkInputs = [ + nativeCheckInputs = [ bc perl (python3.withPackages (ps: with ps; [ numpy scipy ])) diff --git a/pkgs/applications/science/engineering/strictdoc/default.nix b/pkgs/applications/science/engineering/strictdoc/default.nix index ce834f7d576bd..c81652c5ae7e6 100644 --- a/pkgs/applications/science/engineering/strictdoc/default.nix +++ b/pkgs/applications/science/engineering/strictdoc/default.nix @@ -73,7 +73,7 @@ buildPythonApplication rec { XlsxWriter ]; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; diff --git a/pkgs/applications/science/geometry/gama/default.nix b/pkgs/applications/science/geometry/gama/default.nix index 9ca7cc10c77f7..716fadd20fb9e 100644 --- a/pkgs/applications/science/geometry/gama/default.nix +++ b/pkgs/applications/science/geometry/gama/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ texinfo zip ]; - checkInputs = [ octave libxml2 ]; + nativeCheckInputs = [ octave libxml2 ]; doCheck = true; meta = with lib ; { diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 6a94d3f639e25..de9add38ed02b 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -22,7 +22,7 @@ ocamlPackages.buildDunePackage rec { ''; checkPhase = "./TEST"; - checkInputs = [ rsync ]; + nativeCheckInputs = [ rsync ]; doCheck = true; postInstall = '' diff --git a/pkgs/applications/science/logic/bitwuzla/default.nix b/pkgs/applications/science/logic/bitwuzla/default.nix index cc8651f69cfa0..4af4058339d93 100644 --- a/pkgs/applications/science/logic/bitwuzla/default.nix +++ b/pkgs/applications/science/logic/bitwuzla/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { "-DBtor2Tools_LIBRARIES=${lib.getLib btor2tools}/lib/libbtor2parser${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optional doCheck "-DTESTING=YES"; - checkInputs = [ python3 gtest ]; + nativeCheckInputs = [ python3 gtest ]; # two tests fail on darwin and 3 on aarch64-linux doCheck = stdenv.hostPlatform.isLinux && (!stdenv.hostPlatform.isAarch64); preCheck = let diff --git a/pkgs/applications/science/logic/boolector/default.nix b/pkgs/applications/science/logic/boolector/default.nix index 74927dd434d02..1d7e01c553b65 100644 --- a/pkgs/applications/science/logic/boolector/default.nix +++ b/pkgs/applications/science/logic/boolector/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { "-DUSE_LINGELING=YES" ] ++ (lib.optional (gmp != null) "-DUSE_GMP=YES"); - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; preCheck = let var = if stdenv.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; diff --git a/pkgs/applications/science/logic/kissat/default.nix b/pkgs/applications/science/logic/kissat/default.nix index 772e9c22a59a2..48d986cd5f6dd 100644 --- a/pkgs/applications/science/logic/kissat/default.nix +++ b/pkgs/applications/science/logic/kissat/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "lib" ]; - checkInputs = [ drat-trim p7zip ]; + nativeCheckInputs = [ drat-trim p7zip ]; doCheck = true; # 'make test' assumes that /etc/passwd is not writable. diff --git a/pkgs/applications/science/logic/klee/default.nix b/pkgs/applications/science/logic/klee/default.nix index e492daaced378..024e6e526c4e4 100644 --- a/pkgs/applications/science/logic/klee/default.nix +++ b/pkgs/applications/science/logic/klee/default.nix @@ -69,7 +69,7 @@ in stdenv.mkDerivation rec { cmake ]; - checkInputs = [ + nativeCheckInputs = [ gtest # Should appear BEFORE lit, since lit passes through python rather diff --git a/pkgs/applications/science/logic/monosat/default.nix b/pkgs/applications/science/logic/monosat/default.nix index 7295cdd30ae16..5b894d2c9376f 100644 --- a/pkgs/applications/science/logic/monosat/default.nix +++ b/pkgs/applications/science/logic/monosat/default.nix @@ -89,7 +89,7 @@ let --replace 'library_dir = "../../../../"' 'library_dir = "${core}/lib/"' ''; - checkInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ pytestCheckHook ]; disabledTests = [ "test_assertAtMostOne" diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index ffc61ed1d03bb..19c021684b3ff 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation { ''; doCheck = false; # not all provers are yet packaged... - checkInputs = [ python3 yosys boolector yices z3 aiger ]; + nativeCheckInputs = [ python3 yosys boolector yices z3 aiger ]; checkPhase = "make test"; meta = { diff --git a/pkgs/applications/science/math/bcal/default.nix b/pkgs/applications/science/math/bcal/default.nix index b23b433becd31..fedb219a0c194 100644 --- a/pkgs/applications/science/math/bcal/default.nix +++ b/pkgs/applications/science/math/bcal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ bc python3Packages.pytestCheckHook ]; + nativeCheckInputs = [ bc python3Packages.pytestCheckHook ]; pytestFlagsArray = [ "test.py" ]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 8bad09f178802..dffc212176b30 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { strictDeps = true; - checkInputs = [ + nativeCheckInputs = [ gnuplot ]; diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/applications/science/math/yacas/default.nix index f7dc2a344e185..7fa2fe1a6075e 100644 --- a/pkgs/applications/science/math/yacas/default.nix +++ b/pkgs/applications/science/math/yacas/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { preCheck = '' patchShebangs ../tests/test-yacas ''; - checkInputs = [ + nativeCheckInputs = [ gtest ]; doCheck = true; diff --git a/pkgs/applications/science/misc/bada-bib/default.nix b/pkgs/applications/science/misc/bada-bib/default.nix index 2304e9f77f4cb..af2f233966204 100644 --- a/pkgs/applications/science/misc/bada-bib/default.nix +++ b/pkgs/applications/science/misc/bada-bib/default.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication rec { libadwaita ]; - checkInputs = [ + nativeCheckInputs = [ appstream-glib desktop-file-utils ]; diff --git a/pkgs/applications/science/misc/cwltool/default.nix b/pkgs/applications/science/misc/cwltool/default.nix index 5693344e63641..f6d9f4510faf8 100644 --- a/pkgs/applications/science/misc/cwltool/default.nix +++ b/pkgs/applications/science/misc/cwltool/default.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ mock nodejs pytest-mock diff --git a/pkgs/applications/science/misc/nextinspace/default.nix b/pkgs/applications/science/misc/nextinspace/default.nix index 8f168ab83839f..78e21dcd8788e 100644 --- a/pkgs/applications/science/misc/nextinspace/default.nix +++ b/pkgs/applications/science/misc/nextinspace/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { colorama ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytest-lazy-fixture pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/sasview/default.nix b/pkgs/applications/science/misc/sasview/default.nix index 34ad91235e330..ca94be96d64e3 100644 --- a/pkgs/applications/science/misc/sasview/default.nix +++ b/pkgs/applications/science/misc/sasview/default.nix @@ -55,7 +55,7 @@ python3.pkgs.buildPythonApplication rec { "\${qtWrapperArgs[@]}" ]; - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook unittest-xml-reporting ]; diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 89b174515c479..f162e2329a74d 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication rec { # for the current basic test suite. Tibanna and Tes require extra # setup. - checkInputs = with python3.pkgs; [ + nativeCheckInputs = with python3.pkgs; [ pandas pytestCheckHook requests-mock diff --git a/pkgs/applications/science/misc/toil/default.nix b/pkgs/applications/science/misc/toil/default.nix index 43cb6bbbc7ee3..7fc070f4f9f75 100644 --- a/pkgs/applications/science/misc/toil/default.nix +++ b/pkgs/applications/science/misc/toil/default.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { typing-extensions ]; - checkInputs = [ + nativeCheckInputs = [ rsync ] ++ (with python3.pkgs; [ boto |