Merge pull request #115649 from markuskowa/upd-openmpi

openmpi: 4.0.5 -> 4.1.0
This commit is contained in:
markuskowa 2021-03-10 23:08:56 +01:00 committed by GitHub
commit dd201ce4bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions

View File

@ -18,7 +18,7 @@
assert !cudaSupport || cudatoolkit != null; assert !cudaSupport || cudatoolkit != null;
let let
version = "4.0.5"; version = "4.1.0";
cudatoolkit_joined = symlinkJoin { cudatoolkit_joined = symlinkJoin {
name = "${cudatoolkit.name}-unsplit"; name = "${cudatoolkit.name}-unsplit";
@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
src = with lib.versions; fetchurl { src = with lib.versions; fetchurl {
url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2";
sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU=";
}; };
postPatch = '' postPatch = ''

View File

@ -1,4 +1,4 @@
{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }: { lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "mpi4py"; pname = "mpi4py";
@ -9,6 +9,12 @@ buildPythonPackage rec {
sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f";
}; };
patches = [ (fetchpatch {
name = "disable-broken-test"; # upstream patch
url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch";
sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx";
})];
passthru = { passthru = {
inherit mpi; inherit mpi;
}; };