Merge pull request #85215 from markuskowa/upd-globalarrys
globalarrays: 5.7 -> 5.7.1
This commit is contained in:
commit
04713663dd
@ -3,7 +3,7 @@
|
|||||||
} :
|
} :
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "5.7";
|
version = "5.7.2";
|
||||||
|
|
||||||
in stdenv.mkDerivation {
|
in stdenv.mkDerivation {
|
||||||
pname = "globalarrays";
|
pname = "globalarrays";
|
||||||
@ -13,21 +13,9 @@ in stdenv.mkDerivation {
|
|||||||
owner = "GlobalArrays";
|
owner = "GlobalArrays";
|
||||||
repo = "ga";
|
repo = "ga";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "07i2idaas7pq3in5mdqq5ndvxln5q87nyfgk3vzw85r72c4fq5jh";
|
sha256 = "0c1y9a5jpdw9nafzfmvjcln1xc2gklskaly0r1alm18ng9zng33i";
|
||||||
};
|
};
|
||||||
|
|
||||||
# upstream patches for openmpi-4 compatibility
|
|
||||||
patches = [ (fetchpatch {
|
|
||||||
name = "MPI_Type_struct-was-deprecated-in-MPI-2";
|
|
||||||
url = "https://github.com/GlobalArrays/ga/commit/36e6458993b1df745f43b7db86dc17087758e0d2.patch";
|
|
||||||
sha256 = "058qi8x0ananqx980p03yxpyn41cnmm0ifwsl50qp6sc0bnbnclh";
|
|
||||||
})
|
|
||||||
(fetchpatch {
|
|
||||||
name = "MPI_Errhandler_set-was-deprecated-in-MPI-2";
|
|
||||||
url = "https://github.com/GlobalArrays/ga/commit/f1ea5203d2672c1a1d0275a012fb7c2fb3d033d8.patch";
|
|
||||||
sha256 = "06n7ds9alk5xa6hd7waw3wrg88yx2azhdkn3cjs2k189iw8a7fqk";
|
|
||||||
})];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
buildInputs = [ openmpi openblas gfortran openssh ];
|
buildInputs = [ openmpi openblas gfortran openssh ];
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user