diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2019-02-22 17:51:01 +0100 |
| commit | 71f4ba29a3161cec4dc95d6c80863f55ff25f777 (patch) | |
| tree | 67774520442ab886120a8fd3b00dc52ea2455e8e /pkgs/development/python-modules/mpi4py/default.nix | |
| parent | 821c0844d499658666901401f2ae088b85cc2e9a (diff) | |
| parent | e2b96562056ed59bd84c797f31c8decf60d2f5d3 (diff) | |
Merge branch 'master' into staging-next
Hydra nixpkgs: ?compare=1506218
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 09b05f4ab0fcf..d3535589911c6 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 = '' |