movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 19:55:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

treewide: finalAttrs.doCheck -> finalAttrs.finalPackage.doCheck

Browse source
This commit is contained in:
Peder Bergebakken Sundt 2025-03-03 05:40:39 +01:00
parent 2075894398
commit 7972442a9e
21 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/science/machine-learning/shogun/default.nix
View file

@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true) (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true)
(lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true) (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true)
(lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'") (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'${excludeTestsRegex}'")
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck) (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true) (lib.cmakeBool "DISABLE_META_INTEGRATION_TESTS" true)
(lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true) (lib.cmakeBool "TRAVIS_DISABLE_META_CPP" true)
(lib.cmakeBool "INTERFACE_PYTHON" pythonSupport) (lib.cmakeBool "INTERFACE_PYTHON" pythonSupport)

2
pkgs/applications/window-managers/i3/default.nix
View file

@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
# xvfb-run is available only on Linux # xvfb-run is available only on Linux
doCheck = stdenv.hostPlatform.isLinux; doCheck = stdenv.hostPlatform.isLinux;
nativeCheckInputs = lib.optionals finalAttrs.doCheck [ nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [
xorgserver xorgserver
xvfb-run xvfb-run
xdotool xdotool

4
pkgs/by-name/ar/arpack/package.nix
View file

@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries) (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
(lib.cmakeBool "EIGEN" true) (lib.cmakeBool "EIGEN" true)
(lib.cmakeBool "EXAMPLES" finalAttrs.doCheck) (lib.cmakeBool "EXAMPLES" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "ICB" true) (lib.cmakeBool "ICB" true)
(lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64)) (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))
(lib.cmakeBool "MPI" useMpi) (lib.cmakeBool "MPI" useMpi)
(lib.cmakeBool "TESTS" finalAttrs.doCheck) (lib.cmakeBool "TESTS" finalAttrs.finalPackage.doCheck)
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}" "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"
]; ];

2
pkgs/by-name/bl/blobdrop/package.nix
View file

@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
]; ];
doCheck = true; doCheck = true;

2
pkgs/by-name/co/convmv/package.nix
View file

@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = !stdenv.hostPlatform.isDarwin; doCheck = !stdenv.hostPlatform.isDarwin;
prePatch = prePatch =
lib.optionalString finalAttrs.doCheck '' lib.optionalString finalAttrs.finalPackage.doCheck ''
tar -xf testsuite.tar tar -xf testsuite.tar
'' ''
+ '' + ''

4
pkgs/by-name/ge/gemrb/package.nix
View file

@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
] ++ lib.optionals (finalAttrs.doCheck or false) [ gtest ]; ] ++ lib.optionals (finalAttrs.finalPackage.doCheck or false) [ gtest ];
cmakeFlags = [ cmakeFlags = [
(lib.cmakeFeature "DATA_DIR" "${placeholder "out"}/share/gemrb") (lib.cmakeFeature "DATA_DIR" "${placeholder "out"}/share/gemrb")
@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "LAYOUT" "opt") (lib.cmakeFeature "LAYOUT" "opt")
(lib.cmakeFeature "OPENGL_BACKEND" backend) (lib.cmakeFeature "OPENGL_BACKEND" backend)
(lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND")
(lib.cmakeBool "USE_TESTS" (finalAttrs.doCheck or false)) (lib.cmakeBool "USE_TESTS" (finalAttrs.finalPackage.doCheck or false))
]; ];
postInstall = '' postInstall = ''

2
pkgs/by-name/gl/glog/package.nix
View file

@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: rec {
sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4="; sha256 = "sha256-+nwWP6VBmhgU7GCPSEGUzvUSCc48wXME181WpJ5ABP4=";
}; };
postPatch = lib.optionalString finalAttrs.doCheck '' postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
substituteInPlace src/logging_unittest.cc \ substituteInPlace src/logging_unittest.cc \
--replace-warn "/usr/bin/true" "${pkgsBuildHost.coreutils}/bin/true" --replace-warn "/usr/bin/true" "${pkgsBuildHost.coreutils}/bin/true"
''; '';

2
pkgs/by-name/hd/hdf4/package.nix
View file

@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport) (lib.cmakeBool "HDF4_ENABLE_SZIP_SUPPORT" szipSupport)
(lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport) (lib.cmakeBool "HDF4_ENABLE_SZIP_ENCODING" szipSupport)
(lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport) (lib.cmakeBool "HDF4_BUILD_JAVA" javaSupport)
(lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)
] ]
++ lib.optionals javaSupport [ ++ lib.optionals javaSupport [
(lib.cmakeFeature "JAVA_HOME" "${jdk}") (lib.cmakeFeature "JAVA_HOME" "${jdk}")

2
pkgs/by-name/li/lib2geom/package.nix
View file

@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
"-D2GEOM_BUILD_SHARED=ON" "-D2GEOM_BUILD_SHARED=ON"
# For cross compilation. # For cross compilation.
(lib.cmakeBool "2GEOM_TESTING" finalAttrs.doCheck) (lib.cmakeBool "2GEOM_TESTING" finalAttrs.finalPackage.doCheck)
]; ];
doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;

4
pkgs/by-name/li/libconfig/package.nix
View file

@ -20,9 +20,9 @@ stdenv.mkDerivation (finalAttrs: {
configureFlags = configureFlags =
lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples" lib.optional (stdenv.hostPlatform.isWindows || stdenv.hostPlatform.isStatic) "--disable-examples"
++ lib.optional (!finalAttrs.doCheck) "--disable-tests"; ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--disable-tests";
cmakeFlags = lib.optionals (!finalAttrs.doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ]; cmakeFlags = lib.optionals (!finalAttrs.finalPackage.doCheck) [ "-DBUILD_TESTS:BOOL=OFF" ];
meta = { meta = {
homepage = "https://hyperrealm.github.io/libconfig/"; homepage = "https://hyperrealm.github.io/libconfig/";

2
pkgs/by-name/li/libkazv/package.nix
View file

@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true; strictDeps = true;
cmakeFlags = [ (lib.cmakeBool "libkazv_BUILD_TESTS" finalAttrs.doCheck) ]; cmakeFlags = [ (lib.cmakeBool "libkazv_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ];
doCheck = true; doCheck = true;

4
pkgs/by-name/li/libloot/package.nix
View file

@ -83,11 +83,11 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi") (lib.cmakeFeature "LIBLOADORDER_LIBRARIES" "loadorder_ffi")
(lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi") (lib.cmakeFeature "LCI_LIBRARIES" "loot_condition_interpreter_ffi")
(lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins") (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_TESTING-PLUGINS" "../testing-plugins")
(lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.doCheck) (lib.cmakeBool "LIBLOOT_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
(lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs) (lib.cmakeBool "LIBLOOT_INSTALL_DOCS" withDocs)
]; ];
postConfigure = lib.optionalString finalAttrs.doCheck '' postConfigure = lib.optionalString finalAttrs.finalPackage.doCheck ''
cp -r --no-preserve=all ${finalAttrs.passthru.testing-plugins} ../testing-plugins cp -r --no-preserve=all ${finalAttrs.passthru.testing-plugins} ../testing-plugins
''; '';

2
pkgs/by-name/li/libwacom/package.nix
View file

@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
mesonFlags = [ mesonFlags = [
(lib.mesonEnable "tests" finalAttrs.doCheck) (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
(lib.mesonOption "sysconfdir" "/etc") (lib.mesonOption "sysconfdir" "/etc")
]; ];

2
pkgs/by-name/lu/luanti/package.nix
View file

@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
(lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_CLIENT" buildClient)
(lib.cmakeBool "BUILD_SERVER" buildServer) (lib.cmakeBool "BUILD_SERVER" buildServer)
(lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.doCheck or false)) (lib.cmakeBool "BUILD_UNITTESTS" (finalAttrs.finalPackage.doCheck or false))
(lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer)
(lib.cmakeBool "USE_SDL2" useSDL2) (lib.cmakeBool "USE_SDL2" useSDL2)
# Ensure we use system libraries # Ensure we use system libraries

6
pkgs/by-name/st/stp/package.nix
View file

@ -95,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
(lib.cmakeBool "USE_CADICAL" useCadical) (lib.cmakeBool "USE_CADICAL" useCadical)
(lib.cmakeBool "NOCRYPTOMINISAT" useCadical) (lib.cmakeBool "NOCRYPTOMINISAT" useCadical)
(lib.cmakeBool "FORCE_CMS" (!useCadical)) (lib.cmakeBool "FORCE_CMS" (!useCadical))
(lib.cmakeBool "ENABLE_TESTING" finalAttrs.doCheck) (lib.cmakeBool "ENABLE_TESTING" finalAttrs.finalPackage.doCheck)
] ]
++ lib.optional finalAttrs.doCheck (lib.cmakeFeature "LIT_ARGS" "-v") ++ lib.optional finalAttrs.finalPackage.doCheck (lib.cmakeFeature "LIT_ARGS" "-v")
++ lib.optional useCadical (lib.cmakeFeature "CADICAL_DIR" (toString cadicalDependency)); ++ lib.optional useCadical (lib.cmakeFeature "CADICAL_DIR" (toString cadicalDependency));
# Fixes the following warning in the aarch64 build on Linux: # Fixes the following warning in the aarch64 build on Linux:
@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
"-DPYTHON_LIB_INSTALL_DIR=$python_install_dir" "-DPYTHON_LIB_INSTALL_DIR=$python_install_dir"
) )
'' ''
+ lib.optionalString finalAttrs.doCheck '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
# Link in gtest and the output check utility. # Link in gtest and the output check utility.
mkdir -p deps mkdir -p deps
ln -s ${gtest.src} deps/gtest ln -s ${gtest.src} deps/gtest

2
pkgs/by-name/to/tomlplusplus/package.nix
View file

@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
mesonFlags = [ mesonFlags = [
"-Dbuild_tests=${lib.boolToString finalAttrs.doCheck}" "-Dbuild_tests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
"-Dbuild_examples=true" "-Dbuild_examples=true"
]; ];

6
pkgs/development/compilers/flutter/engine/package.nix
View file

@ -265,8 +265,8 @@ stdenv.mkDerivation (finalAttrs: {
] ]
++ lib.optional (!isOptimized) "--unoptimized" ++ lib.optional (!isOptimized) "--unoptimized"
++ lib.optional (runtimeMode == "debug") "--no-stripped" ++ lib.optional (runtimeMode == "debug") "--no-stripped"
++ lib.optional finalAttrs.doCheck "--enable-unittests" ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
++ lib.optional (!finalAttrs.doCheck) "--no-enable-unittests"; ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
# NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk" # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk"
configurePhase = configurePhase =
@ -318,7 +318,7 @@ stdenv.mkDerivation (finalAttrs: {
find $out/out/$outName -name '*_unittests' -delete find $out/out/$outName -name '*_unittests' -delete
find $out/out/$outName -name '*_benchmarks' -delete find $out/out/$outName -name '*_benchmarks' -delete
'' ''
+ lib.optionalString (finalAttrs.doCheck) '' + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
rm $out/out/$outName/{display_list_rendertests,flutter_tester} rm $out/out/$outName/{display_list_rendertests,flutter_tester}
'' ''
+ '' + ''

2
pkgs/development/libraries/botan/default.nix
View file

@ -64,7 +64,7 @@ let
buildTargets = buildTargets =
[ "cli" ] [ "cli" ]
++ lib.optionals finalAttrs.doCheck [ "tests" ] ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
++ lib.optionals static [ "static" ] ++ lib.optionals static [ "static" ]
++ lib.optionals (!static) [ "shared" ]; ++ lib.optionals (!static) [ "shared" ];

4
pkgs/development/libraries/wayland/protocols.nix
View file

@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
hash = "sha256-shcReTJHwsQnY5FDkt+p/LnjcoyktKoRCtuNkV/ABok="; hash = "sha256-shcReTJHwsQnY5FDkt+p/LnjcoyktKoRCtuNkV/ABok=";
}; };
postPatch = lib.optionalString finalAttrs.doCheck '' postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
patchShebangs tests/ patchShebangs tests/
''; '';
@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
checkInputs = [ wayland ]; checkInputs = [ wayland ];
strictDeps = true; strictDeps = true;
mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.doCheck}" ]; mesonFlags = [ "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}" ];
meta = { meta = {
description = "Wayland protocol extensions"; description = "Wayland protocol extensions";

2
pkgs/development/tools/database/sqlitebrowser/default.nix
View file

@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
cmakeFlags = [ cmakeFlags = [
"-Dsqlcipher=1" "-Dsqlcipher=1"
(lib.cmakeBool "ENABLE_TESTING" (finalAttrs.doCheck or false)) (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.finalPackage.doCheck or false))
]; ];
doCheck = true; doCheck = true;

4
pkgs/tools/package-management/nix/2_26/src/perl/package.nix
View file

@ -31,7 +31,7 @@ perl.pkgs.toPerlModule (
./meson.build ./meson.build
./meson.options ./meson.options
] ]
++ lib.optionals finalAttrs.doCheck [ ++ lib.optionals finalAttrs.finalPackage.doCheck [
./.yath.rc.in ./.yath.rc.in
./t ./t
] ]
@ -70,7 +70,7 @@ perl.pkgs.toPerlModule (
mesonFlags = [ mesonFlags = [
(lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}") (lib.mesonOption "dbi_path" "${perlPackages.DBI}/${perl.libPrefix}")
(lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}") (lib.mesonOption "dbd_sqlite_path" "${perlPackages.DBDSQLite}/${perl.libPrefix}")
(lib.mesonEnable "tests" finalAttrs.doCheck) (lib.mesonEnable "tests" finalAttrs.finalPackage.doCheck)
]; ];
mesonCheckFlags = [ mesonCheckFlags = [