movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 13:40:28 +03:00
Code Activity

Merge branch 'master' into staging-next

Browse source 
Hydra nixpkgs: ?compare=1506218
This commit is contained in:
Vladimír Čunát 2019-02-22 17:51:01 +01:00
commit 71f4ba29a3
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
163 changed files with 1856 additions and 870 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pkgs/development/python-modules/mpi4py/default.nix
View file

@ -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 = ''