jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #58792 from markuskowa/upd-mpi4py

Browse Source 
pythonPackages.mpi4py: 3.0.0 -> 3.0.1
This commit is contained in:
markuskowa 2019-04-08 13:57:09 +02:00 committed by GitHub
commit 6b682c001d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/python-modules/h5py/default.nix
View File

@ -30,7 +30,7 @@ in buildPythonPackage rec {
preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else "";
checkInputs = optional isPy27 unittest2;
checkInputs = optional isPy27 unittest2 ++ [ openssh ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ hdf5 cython ]
++ optional mpiSupport mpi;

18
pkgs/development/python-modules/mpi4py/default.nix
View File

@ -2,31 +2,17 @@
buildPythonPackage rec {
pname = "mpi4py";
version = "3.0.0";
version = "3.0.1";
src = fetchPypi {
inherit pname version;
sha256 = "1mzgd26dfv4vwbci8gq77ss9f0x26i9aqzq9b9vs9ndxhlnv0mxl";
sha256 = "0ld8rjmsjr0dklvj2g1gr3ax32sdq0xjxyh0cspknc1i36waajb5";
};
passthru = {
inherit mpi;
};
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 = ''
substituteInPlace test/test_spawn.py --replace \
"unittest.skipMPI('openmpi(<3.0.0)')" \