From a2b6c7b042150ed68fda999bb65a56b4cc757c66 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 20 Jan 2021 17:48:33 +0000 Subject: [PATCH 1/2] openmpi: 4.0.5 -> 4.1.0 --- pkgs/development/libraries/openmpi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 802685970ac..46b2748cad9 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.5"; + version = "4.1.0"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; + sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; }; postPatch = '' From 153ff6aacf42584a6e1ec22a005dfde81e5f49d9 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 10 Mar 2021 00:26:10 +0100 Subject: [PATCH 2/2] pythonPackage.mpi4py: add patch for openmpi 4.1.0 --- pkgs/development/python-modules/mpi4py/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix index 058133665f4..6e8fd896d91 100644 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; }; + patches = [ (fetchpatch { + name = "disable-broken-test"; # upstream patch + url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch"; + sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx"; + })]; + passthru = { inherit mpi; };