diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2019-02-22 09:31:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-22 09:31:23 +0100 |
| commit | 5c8c2587276506e61ec51e4b7d6c9288fd226794 (patch) | |
| tree | 06e962d885c68bf406a879c294d0f2d9c0b0dd54 /pkgs/development/python-modules | |
| parent | f96d4d555ba9fba3e0f341b7a8ff04e85ddc2216 (diff) | |
| parent | 99ca454f2366c1468a7d400cb1ccc5294fd19529 (diff) | |
| download | nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar.gz nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar.bz2 nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar.lz nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar.xz nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.tar.zst nixlib-5c8c2587276506e61ec51e4b7d6c9288fd226794.zip | |
Merge pull request #54877 from markuskowa/upd-openmpi4
openmpi: 3.1.3 -> 4.0.0
Diffstat (limited to 'pkgs/development/python-modules')
| -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 6d3897475ad4..74b061602c78 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 = '' |