Unverified Commit 23e80e44 authored by Peder Bergebakken Sundt's avatar Peder Bergebakken Sundt Committed by GitHub
Browse files

treewide: `finalAttrs.doCheck` -> `finalAttrs.finalPackage.doCheck` (#386590)

parents d7b5df84 7972442a

pkgs/applications/science/machine-learning/shogun/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { 
      (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_TFLogger" true)

      (lib.cmakeBool "CMAKE_DISABLE_FIND_PACKAGE_ViennaCL" true)

      (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 "TRAVIS_DISABLE_META_CPP" true)

      (lib.cmakeBool "INTERFACE_PYTHON" pythonSupport)

pkgs/applications/window-managers/i3/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { 
  # xvfb-run is available only on Linux

  doCheck = stdenv.hostPlatform.isLinux;



  nativeCheckInputs = lib.optionals finalAttrs.doCheck [

  nativeCheckInputs = lib.optionals finalAttrs.finalPackage.doCheck [

    xorgserver

    xvfb-run

    xdotool

pkgs/by-name/ar/arpack/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ stdenv.mkDerivation (finalAttrs: { 
  cmakeFlags = [

    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)

    (lib.cmakeBool "EIGEN" true)

    (lib.cmakeBool "EXAMPLES" finalAttrs.doCheck)

    (lib.cmakeBool "EXAMPLES" finalAttrs.finalPackage.doCheck)

    (lib.cmakeBool "ICB" true)

    (lib.cmakeBool "INTERFACE64" (!useAccel && blas.isILP64))

    (lib.cmakeBool "MPI" useMpi)

    (lib.cmakeBool "TESTS" finalAttrs.doCheck)

    (lib.cmakeBool "TESTS" finalAttrs.finalPackage.doCheck)

  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [

    "-DBLA_VENDOR=${if useAccel then "Apple" else "Generic"}"

  ];

pkgs/by-name/bl/blobdrop/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { 
    ];



  cmakeFlags = [

    (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck)

    (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck)

  ];



  doCheck = true;

pkgs/by-name/co/convmv/package.nix

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { 
  doCheck = !stdenv.hostPlatform.isDarwin;



  prePatch =

    lib.optionalString finalAttrs.doCheck ''

    lib.optionalString finalAttrs.finalPackage.doCheck ''

      tar -xf testsuite.tar

    ''

    + ''