From 7262ee3118584d8ab1ec57c9f5821df4591f20eb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 4 Oct 2024 11:04:18 +0200
Subject: [PATCH] mpich: 4.2.2 -> 4.2.3

---
 pkgs/development/libraries/mpich/default.nix     | 16 ++++++++++++----
 .../libraries/mpich/disable-romio-tests.patch    | 13 +++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/mpich/disable-romio-tests.patch

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 4af559b50758..1e162cb325ea 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, perl, gfortran
+{ stdenv, lib, fetchurl, perl, gfortran, automake, autoconf
 , openssh, hwloc, python3
 , darwin
 # either libfabric or ucx work for ch4backend on linux. On darwin, neither of
@@ -21,13 +21,21 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
 
 stdenv.mkDerivation  rec {
   pname = "mpich";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE=";
+    hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg=";
   };
 
+  patches = [
+    # Disables ROMIO test which was enabled in
+    # https://github.com/pmodels/mpich/commit/09686f45d77b7739f7aef4c2c6ef4c3060946595
+    # The test searches for mpicc in $out/bin, which is not yet present in the checkPhase
+    # Moreover it fails one test.
+    ./disable-romio-tests.patch
+  ];
+
   outputs = [ "out" "doc" "man" ];
 
   configureFlags = [
@@ -42,7 +50,7 @@ stdenv.mkDerivation  rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ gfortran python3 ];
+  nativeBuildInputs = [ gfortran python3 autoconf automake ];
   buildInputs = [ perl openssh hwloc ]
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend
     ++ lib.optional pmixSupport pmix
diff --git a/pkgs/development/libraries/mpich/disable-romio-tests.patch b/pkgs/development/libraries/mpich/disable-romio-tests.patch
new file mode 100644
index 000000000000..2a4cd96aee69
--- /dev/null
+++ b/pkgs/development/libraries/mpich/disable-romio-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am
+index a6429766f..658f1c563 100644
+--- a/src/mpi/romio/Makefile.am
++++ b/src/mpi/romio/Makefile.am
+@@ -56,7 +56,7 @@ nodist_include_HEADERS += include/mpio.h include/mpiof.h
+ 
+ # ------------------------------------------------------------------------
+ 
+-SUBDIRS = $(external_subdirs) . test
++SUBDIRS = $(external_subdirs)
+ DIST_SUBDIRS = test test-internal $(external_dist_subdirs)
+ 
+ # for the sake of parallel make and avoiding an excessive number of convenience