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

Merge pull request #46007 from markuskowa/openmpi-up 

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/openmpi/default.nix
View File

@ -10,14 +10,14 @@
let let
majorVersion = "3.1"; majorVersion = "3.1";
minorVersion = "0"; minorVersion = "2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "openmpi-${majorVersion}.${minorVersion}"; name = "openmpi-${majorVersion}.${minorVersion}";
src = fetchurl { src = fetchurl {
url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2"; url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j"; sha256 = "1ibniapqki763agpfh65y284las083fqmj8m5b2pi8ilgy2fsm66";
}; };
postPatch = '' postPatch = ''

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 { buildPythonPackage rec {
pname = "mpi4py"; pname = "mpi4py";
@ -13,6 +13,13 @@ buildPythonPackage rec {
inherit mpi; 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 = '' postPatch = ''
substituteInPlace test/test_spawn.py --replace \ substituteInPlace test/test_spawn.py --replace \
"unittest.skipMPI('openmpi(<3.0.0)')" \ "unittest.skipMPI('openmpi(<3.0.0)')" \