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

Merge pull request #46007 from markuskowa/openmpi-up

Browse Source 
openmpi: 3.1.0->3.1.2
This commit is contained in:
Matthew Bauer
2018-09-29 13:24:46 -05:00
committed by GitHub
parent 30f58023dd 676825f6fe
commit 228d6f5068
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ stdenv, fetchPypi, python, buildPythonPackage, mpi, openssh }:
{ stdenv, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
buildPythonPackage rec {
pname = "mpi4py";
@@ -13,6 +13,13 @@ 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";
})
];
postPatch = ''
substituteInPlace test/test_spawn.py --replace \
"unittest.skipMPI('openmpi(<3.0.0)')" \