Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7e822660c66c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 04713663ddec
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Apr 14, 2020

  1. globalarrays: 5.7 -> 5.7.1

    @markuskowa
    markuskowa committed Apr 14, 2020
    Copy the full SHA
    11a99fb View commit details

  2. Merge pull request #85215 from markuskowa/upd-globalarrys 

    globalarrays: 5.7 -> 5.7.1
    @markuskowa
    markuskowa authored Apr 14, 2020
    Copy the full SHA
    0471366 View commit details
Showing with 2 additions and 14 deletions.
  1. +2 −14 pkgs/development/libraries/globalarrays/default.nix
16 changes: 2 additions & 14 deletions pkgs/development/libraries/globalarrays/default.nix
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
} :

let
version = "5.7";
version = "5.7.2";

in stdenv.mkDerivation {
pname = "globalarrays";
@@ -13,21 +13,9 @@ in stdenv.mkDerivation {
owner = "GlobalArrays";
repo = "ga";
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 ];
buildInputs = [ openmpi openblas gfortran openssh ];