From 2e0b33df7ee6c1efdb0c9c5a412528369df4dba4 Mon Sep 17 00:00:00 2001 From: qbisi Date: Thu, 19 Feb 2026 09:50:08 +0800 Subject: [PATCH] scotch: 7.0.10 -> 7.0.11; doCheck --- pkgs/by-name/sc/scotch/package.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index cdc572cbae56..732e70d4dc78 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -10,6 +10,7 @@ xz, zlib, mpi, + mpiCheckPhaseHook, withPtScotch ? false, testers, pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false @@ -18,14 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.10"; + version = "7.0.11"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; - rev = "v${finalAttrs.version}"; - hash = "sha256-qeMgTkoM/RDsZa0T6hmrDLbLuSeR8WNxllyHSlkMVzA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ljz4Xu3ztxhx8c+gRYABG85T9SuauQc4UsVHPmREvkk="; }; outputs = [ @@ -39,8 +40,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_PTSCOTCH" withPtScotch) # Prefix Scotch version of MeTiS routines (lib.cmakeBool "SCOTCH_METIS_PREFIX" true) - # building tests is broken with SCOTCH_METIS_PREFIX enabled, at least since 7.0.9 - (lib.cmakeBool "ENABLE_TESTS" false) + (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ]; nativeBuildInputs = [ @@ -60,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: { mpi ]; + nativeCheckInputs = lib.optionals withPtScotch [ + mpiCheckPhaseHook + ]; + + __darwinAllowLocalNetworking = withPtScotch; + + doCheck = true; + # SCOTCH provide compatibility with Metis/Parmetis interface. # We install the metis compatible headers to subdirectory to # avoid conflict with metis/parmetis.