summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@fysik.su.se>2018-08-20 15:49:46 +0200
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2018-09-26 23:38:55 +0200
commitbe02ab2f30d55874f477e140ba812d51e0674a7a (patch)
tree3fabf01629b2b01d858e930044b916244bb510fd
parent4d3ed9f5d56179e75999371b0df4b4db73b68249 (diff)
downloadnixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar.gz
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar.bz2
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar.lz
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar.xz
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.tar.zst
nixlib-be02ab2f30d55874f477e140ba812d51e0674a7a.zip
openmpi: 3.1.0 -> 3.1.2
-rw-r--r--pkgs/development/libraries/openmpi/default.nix4
-rw-r--r--pkgs/development/python-modules/mpi4py/default.nix2
2 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index a279fe79940f..b5651e8f02ad 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -10,14 +10,14 @@
 
 let
   majorVersion = "3.1";
-  minorVersion = "0";
+  minorVersion = "2";
 
 in stdenv.mkDerivation rec {
   name = "openmpi-${majorVersion}.${minorVersion}";
 
   src = fetchurl {
     url = "http://www.open-mpi.org/software/ompi/v${majorVersion}/downloads/${name}.tar.bz2";
-    sha256 = "0v7hrmf1z5d1rmm0z5gi79l536j3z5s5b0kf9q5rr1fc4i0h8p5j";
+    sha256 = "1ibniapqki763agpfh65y284las083fqmj8m5b2pi8ilgy2fsm66";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix
index 1b4ad50c781f..6b69df614137 100644
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
     # Needed to run the tests reliably. See:
     # https://bitbucket.org/mpi4py/mpi4py/issues/87/multiple-test-errors-with-openmpi-30
     export OMPI_MCA_rmaps_base_oversubscribe=yes
+    export OMPI_MCA_osc=sm
+    export OMPI_MCA_btl=self,vader
   '';
 
   setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"];