From 081227701e0d75e58d599de4383102565dd149c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 3 Jun 2026 06:34:49 +0000
Subject: [PATCH] conduit: 0.9.5 -> 0.9.7

---
 pkgs/by-name/co/conduit/package.nix           | 25 ++++++++----
 .../python-modules/conduit/default.nix        | 39 ++++++++++++-------
 2 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/co/conduit/package.nix b/pkgs/by-name/co/conduit/package.nix
index b86b3f91bfac..21d7033120f5 100644
--- a/pkgs/by-name/co/conduit/package.nix
+++ b/pkgs/by-name/co/conduit/package.nix
@@ -15,14 +15,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "conduit";
-  version = "0.9.5";
+  version = "0.9.7";
 
   src = fetchFromGitHub {
     owner = "LLNL";
     repo = "conduit";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-mX7/5C4wd70Kx1rQyo2BcZMwDRqvxo4fBdz3pq7PuvM=";
+    hash = "sha256-DmnHGj6Q/i+wVNIbaTGrFX9f0Kry2X5bC7zahXv29I4=";
   };
 
   nativeBuildInputs = [
@@ -41,13 +41,24 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "ENABLE_MPI" mpiSupport)
   ];
 
-  installCheckPhase = ''
-    runHook preInstallCheck
+  installCheckPhase =
+    let
+      excludedTests = lib.optionals stdenv.hostPlatform.isDarwin [
+        # SIGTRAP***Exception
+        "t_conduit_fixed_size_vector"
+      ];
 
-    make test
+      excludedTestsString = lib.optionalString (
+        excludedTests != [ ]
+      ) "-E '^(${builtins.concatStringsSep "|" excludedTests})$'";
+    in
+    ''
+      runHook preInstallCheck
 
-    runHook postInstallCheck
-  '';
+      ctest --output-on-failure ${excludedTestsString}
+
+      runHook postInstallCheck
+    '';
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/development/python-modules/conduit/default.nix b/pkgs/development/python-modules/conduit/default.nix
index 9fd15ff2eea0..837eec0364d1 100644
--- a/pkgs/development/python-modules/conduit/default.nix
+++ b/pkgs/development/python-modules/conduit/default.nix
@@ -3,9 +3,18 @@
   stdenv,
   pkgs,
   buildPythonPackage,
-  setuptools,
-  numpy,
+
+  # build-system
+  cmake,
+  ninja,
   pip,
+  setuptools,
+
+  # nativeBuildInputs
+  openmpi,
+
+  # dependencies
+  numpy,
 
   mpiSupport ? false,
 }:
@@ -17,32 +26,36 @@ buildPythonPackage {
     pname
     version
     src
-    nativeBuildInputs
+    # nativeBuildInputs
     buildInputs
     ;
   pyproject = true;
+  __structuredAttrs = true;
 
-  # Needed for cmake to find openmpi
-  strictDeps = false;
-
-  postPatch = ''
-    substituteInPlace setup.py \
+  postPatch = (conduit.postPatch or "") + ''
+    substituteInPlace pyproject.toml \
       --replace-fail \
-        "'-j2'" \
-        "f'-j{os.environ.get(\"NIX_BUILD_CORES\")}'"
+        "cmake<=3.30.0" \
+        "cmake"
   '';
 
-  dontUseCmakeConfigure = true;
-
   env.ENABLE_MPI = mpiSupport;
 
   build-system = [
+    cmake
+    ninja
+    pip
     setuptools
   ];
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = conduit.nativeBuildInputs ++ [
+    # openmpi needs to be in nativeBuildInputs, otherwise cmake can't find it
+    openmpi
+  ];
 
   dependencies = [
     numpy
-    pip
   ];
 
   pythonImportsCheck = [ "conduit" ];