mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
mpich: 4.2.2 -> 4.2.3
This commit is contained in:
parent
2199b69a7a
commit
7262ee3118
@ -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
|
||||
|
13
pkgs/development/libraries/mpich/disable-romio-tests.patch
Normal file
13
pkgs/development/libraries/mpich/disable-romio-tests.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user