diff options
author | Markus Kowalewski <markus.kowalewski@fysik.su.se> | 2019-01-29 11:24:36 +0100 |
---|---|---|
committer | Markus Kowalewski <markus.kowalewski@fysik.su.se> | 2019-02-21 15:08:33 +0100 |
commit | 10e5cfd5fcb786227cbcbe4ba09c6d02cb463f1d (patch) | |
tree | 6973bf81e2962659f1fd8e70852c6b064a0214de /pkgs/development/python-modules/mpi4py/default.nix | |
parent | 4aa90ac08927dcb93f281235349555ac98dfcbda (diff) |
pythonPackages.mpi4py: add patch for openmpi-4.0.0 compatibility
Diffstat (limited to 'pkgs/development/python-modules/mpi4py/default.nix')
-rw-r--r-- | pkgs/development/python-modules/mpi4py/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 6d3897475ad41..74b061602c78c 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -13,11 +13,18 @@ buildPythonPackage rec { inherit mpi; }; - patches = [ (fetchpatch { - # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE - url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; - sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; + patches = [ + (fetchpatch { + # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw"; + sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q"; }) + (fetchpatch { + # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch) + url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw"; + sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q"; + }) + ]; postPatch = '' |