From 5e831ad15b31f50bdb4cda1c875af33b55ccf87e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 1 Oct 2025 03:15:10 +0000 Subject: [PATCH 1/3] scotch: 7.0.9 -> 7.0.10 --- pkgs/by-name/sc/scotch/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index 9fafe1d1da77..e1977db4cf05 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "scotch"; - version = "7.0.9"; + version = "7.0.10"; src = fetchFromGitLab { domain = "gitlab.inria.fr"; owner = "scotch"; repo = "scotch"; rev = "v${finalAttrs.version}"; - hash = "sha256-dbf18XdmDP0KgS4H4L7Wnam7kGF88yBcCvehYRRpHvA="; + hash = "sha256-qeMgTkoM/RDsZa0T6hmrDLbLuSeR8WNxllyHSlkMVzA="; }; outputs = [ @@ -37,7 +37,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 in 7.0.9 + # building tests is broken with SCOTCH_METIS_PREFIX enabled, at least since 7.0.9 (lib.cmakeBool "ENABLE_TESTS" false) ]; From 03cba73633358c1a2f8a4d5afc36c6e34ac57dac Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 1 Oct 2025 10:44:05 +0200 Subject: [PATCH 2/3] scotch: add update script --- pkgs/by-name/sc/scotch/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index e1977db4cf05..f98420c1e9de 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -12,6 +12,7 @@ mpi, withPtScotch ? false, testers, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { @@ -58,15 +59,6 @@ stdenv.mkDerivation (finalAttrs: { mpi ]; - passthru = { - tests = { - cmake-config = testers.hasCmakeConfigModules { - moduleNames = [ "SCOTCH" ]; - package = finalAttrs.finalPackage; - }; - }; - }; - # SCOTCH provide compatibility with Metis/Parmetis interface. # We install the metis compatible headers to subdirectory to # avoid conflict with metis/parmetis. @@ -75,6 +67,17 @@ stdenv.mkDerivation (finalAttrs: { mv $dev/include/{*metis,metisf}.h $dev/include/scotch ''; + passthru = { + tests = { + cmake-config = testers.hasCmakeConfigModules { + moduleNames = [ "SCOTCH" ]; + package = finalAttrs.finalPackage; + }; + }; + + updateScript = nix-update-script { }; + }; + meta = { description = "Graph and mesh/hypergraph partitioning, graph clustering, and sparse matrix ordering"; longDescription = '' From 36214220d7c4cc749d607ed8a50fc66a59275fb0 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Wed, 1 Oct 2025 11:32:05 +0200 Subject: [PATCH 3/3] scotch: add musl to passthru.tests --- pkgs/by-name/sc/scotch/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/sc/scotch/package.nix b/pkgs/by-name/sc/scotch/package.nix index f98420c1e9de..cdc572cbae56 100644 --- a/pkgs/by-name/sc/scotch/package.nix +++ b/pkgs/by-name/sc/scotch/package.nix @@ -12,6 +12,7 @@ mpi, withPtScotch ? false, testers, + pkgsMusl ? { }, # default to empty set to avoid CI fails with allowVariants = false nix-update-script, }: @@ -73,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: { moduleNames = [ "SCOTCH" ]; package = finalAttrs.finalPackage; }; + musl = pkgsMusl.scotch or null; }; updateScript = nix-update-script { };