diff options
author | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
---|---|---|
committer | Guillaume Girol <symphorien+git@xlumurb.eu> | 2023-01-21 12:00:00 +0000 |
commit | 33afbf39f6f2a6b37e99f070ba7d17a28c416d02 (patch) | |
tree | 6431c14751da2ff638abc06b1c8e11f99315f2c3 /pkgs/development/compilers | |
parent | 25193e2732e178f701f517ca15ff802f03b29933 (diff) | |
download | nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.gz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.bz2 nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.lz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.xz nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.tar.zst nixpkgs-33afbf39f6f2a6b37e99f070ba7d17a28c416d02.zip |
treewide: switch to nativeCheckInputs
checkInputs used to be added to nativeBuildInputs. Now we have nativeCheckInputs to do that instead. Doing this treewide change allows to keep hashes identical to before the introduction of nativeCheckInputs.
Diffstat (limited to 'pkgs/development/compilers')
21 files changed, 23 insertions, 23 deletions
diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 96483df724c..f6359a9b26c 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { fi ''; - checkInputs = [ gtest lit nodejs filecheck ]; + nativeCheckInputs = [ gtest lit nodejs filecheck ]; checkPhase = '' LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/lib python3 ../check.py $tests ''; diff --git a/pkgs/development/compilers/blueprint/default.nix b/pkgs/development/compilers/blueprint/default.nix index 425ea5766f9..0016c8a2c7d 100644 --- a/pkgs/development/compilers/blueprint/default.nix +++ b/pkgs/development/compilers/blueprint/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gtk4 ]; diff --git a/pkgs/development/compilers/bluespec/default.nix b/pkgs/development/compilers/bluespec/default.nix index d6accbdbf1f..4970d02e32c 100644 --- a/pkgs/development/compilers/bluespec/default.nix +++ b/pkgs/development/compilers/bluespec/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { doCheck = true; - checkInputs = [ + nativeCheckInputs = [ gmp-static verilog ]; diff --git a/pkgs/development/compilers/c3c/default.nix b/pkgs/development/compilers/c3c/default.nix index 2fa280fc898..b68ffc045f6 100644 --- a/pkgs/development/compilers/c3c/default.nix +++ b/pkgs/development/compilers/c3c/default.nix @@ -23,7 +23,7 @@ llvmPackages.stdenv.mkDerivation rec { llvmPackages.lld ]; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; doCheck = true; diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix index 2d445d94f68..9470db3d38c 100644 --- a/pkgs/development/compilers/cmdstan/default.nix +++ b/pkgs/development/compilers/cmdstan/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; doCheck = true; - checkInputs = [ python3 ]; + nativeCheckInputs = [ python3 ]; CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA"; diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index af4d3a19337..96c36bad6f7 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -42,7 +42,7 @@ let arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); isAarch64Darwin = stdenv.system == "aarch64-darwin"; - checkInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; + nativeCheckInputs = [ git gmp openssl readline libxml2 libyaml libffi ]; binaryUrl = version: rel: if arch == archs.aarch64-linux then @@ -230,8 +230,8 @@ let checkTarget = "compiler_spec"; preCheck = '' - export LIBRARY_PATH=${lib.makeLibraryPath checkInputs}:$LIBRARY_PATH - export PATH=${lib.makeBinPath checkInputs}:$PATH + export LIBRARY_PATH=${lib.makeLibraryPath nativeCheckInputs}:$LIBRARY_PATH + export PATH=${lib.makeBinPath nativeCheckInputs}:$PATH ''; passthru.buildBinary = binary; diff --git a/pkgs/development/compilers/dale/default.nix b/pkgs/development/compilers/dale/default.nix index 7feb364976e..816e8e08f4a 100644 --- a/pkgs/development/compilers/dale/default.nix +++ b/pkgs/development/compilers/dale/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake pkg-config llvm_13.dev ]; buildInputs = [ libffi llvm_13 ]; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; checkTarget = "tests"; diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index d4bb8bb6282..c862bb2bbfd 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -158,7 +158,7 @@ stdenv.mkDerivation rec { Foundation ]; - checkInputs = [ + nativeCheckInputs = [ gdb ] ++ lib.optionals (lib.versionOlder version "2.089.0") [ unzip diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix index 8ee5da4078d..531107ddd44 100644 --- a/pkgs/development/compilers/flutter/flutter.nix +++ b/pkgs/development/compilers/flutter/flutter.nix @@ -85,7 +85,7 @@ let ''; doInstallCheck = true; - installCheckInputs = [ which ]; + nativeInstallCheckInputs = [ which ]; installCheckPhase = '' runHook preInstallCheck diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix index 7f413877a59..2760eb268c1 100644 --- a/pkgs/development/compilers/idris2/default.nix +++ b/pkgs/development/compilers/idris2/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { buildFlags = [ "bootstrap" "SCHEME=scheme" ]; checkTarget = "test"; - checkInputs = [ gambit nodejs ]; # racket ]; + nativeCheckInputs = [ gambit nodejs ]; # racket ]; checkFlags = [ "INTERACTIVE=" ]; # TODO: Move this into its own derivation, such that this can be changed diff --git a/pkgs/development/compilers/ligo/default.nix b/pkgs/development/compilers/ligo/default.nix index 69a8cb39317..72f4a959118 100644 --- a/pkgs/development/compilers/ligo/default.nix +++ b/pkgs/development/compilers/ligo/default.nix @@ -96,7 +96,7 @@ ocamlPackages.buildDunePackage rec { zarith_stubs_js ]; - checkInputs = [ + nativeCheckInputs = [ cacert ocamlPackages.ca-certs ]; diff --git a/pkgs/development/compilers/llvm/13/llvm/default.nix b/pkgs/development/compilers/llvm/13/llvm/default.nix index 0cdc79a4a57..32e96212fa5 100644 --- a/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = optionals (stdenv.hostPlatform == stdenv.buildPlatform) [ ncurses ] ++ [ zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ # When cross-compiling we configure llvm-config-native with an approximation diff --git a/pkgs/development/compilers/llvm/14/llvm/default.nix b/pkgs/development/compilers/llvm/14/llvm/default.nix index 1134f0a6ab1..5437735f78f 100644 --- a/pkgs/development/compilers/llvm/14/llvm/default.nix +++ b/pkgs/development/compilers/llvm/14/llvm/default.nix @@ -56,7 +56,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/llvm/git/llvm/default.nix b/pkgs/development/compilers/llvm/git/llvm/default.nix index 656c226574a..b4e2757f20c 100644 --- a/pkgs/development/compilers/llvm/git/llvm/default.nix +++ b/pkgs/development/compilers/llvm/git/llvm/default.nix @@ -57,7 +57,7 @@ in stdenv.mkDerivation (rec { propagatedBuildInputs = [ ncurses zlib ]; - checkInputs = [ which ]; + nativeCheckInputs = [ which ]; patches = [ ./gnu-install-dirs.patch diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index d00a354be18..55bf5237e61 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -84,7 +84,7 @@ let buildInputs = [ boost ] ++ lib.optionals z3Support [ z3 ] ++ lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python3 ]; + nativeCheckInputs = [ ncurses python3 ]; # tests take 60+ minutes to complete, only run as part of passthru tests doCheck = false; diff --git a/pkgs/development/compilers/spirv-llvm-translator/default.nix b/pkgs/development/compilers/spirv-llvm-translator/default.nix index 052df63aecb..19fa928a4d0 100644 --- a/pkgs/development/compilers/spirv-llvm-translator/default.nix +++ b/pkgs/development/compilers/spirv-llvm-translator/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { buildInputs = [ spirv-headers ] ++ lib.optionals (!isROCm) [ llvm ]; - checkInputs = [ lit ]; + nativeCheckInputs = [ lit ]; cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=ON" diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix index 0ea6e7b0759..50bc73582f1 100644 --- a/pkgs/development/compilers/swift/default.nix +++ b/pkgs/development/compilers/swift/default.nix @@ -389,7 +389,7 @@ stdenv.mkDerivation { doCheck = true; - checkInputs = [ file ]; + nativeCheckInputs = [ file ]; checkPhase = '' # Remove compiler build system tests which fail due to our modified default build profile and diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 2f6eb98be28..0d2541a5a1a 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -52,7 +52,7 @@ buildGoModule rec { ./0003-Use-out-path-as-build-id-on-darwin.patch ]; - checkInputs = [ avrgcc binaryen ]; + nativeCheckInputs = [ avrgcc binaryen ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ llvm clang.cc ] ++ lib.optionals stdenv.isDarwin [ zlib ncurses libffi libxml2 xar ]; diff --git a/pkgs/development/compilers/xa/xa.nix b/pkgs/development/compilers/xa/xa.nix index 0fb9d7d058b..db719c8fd23 100644 --- a/pkgs/development/compilers/xa/xa.nix +++ b/pkgs/development/compilers/xa/xa.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { hash = "sha256-qUd68VC2yKkc09QeHPjJ31UtODMmSVV2gwJxykRnvYY="; }; - checkInputs = [ perl ]; + nativeCheckInputs = [ perl ]; dontConfigure = true; diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 122de5ac100..e1c035745f7 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -127,7 +127,7 @@ in stdenv.mkDerivation rec { checkTarget = "test"; doCheck = true; - checkInputs = [ verilog ]; + nativeCheckInputs = [ verilog ]; # Internally, yosys knows to use the specified hardcoded ABCEXTERNAL binary. # But other tools (like mcy or symbiyosys) can't know how yosys was built, so diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix index 31e429284c0..89900673587 100644 --- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix +++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix @@ -54,7 +54,7 @@ in lib.genAttrs plugins (plugin: stdenv.mkDerivation (rec { # xdc has an incorrect path to a test which has yet to be patched doCheck = plugin != "xdc"; - checkInputs = [ static_gtest ]; + nativeCheckInputs = [ static_gtest ]; # ql-qlf tries to fetch a yosys script from github # Run the script in preBuild instead. |