summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarkus Kowalewski <markus.kowalewski@gmail.com>2022-02-03 21:09:59 +0100
committerMarkus Kowalewski <markus.kowalewski@gmail.com>2022-02-03 21:57:05 +0100
commit52899ec696cb78be8d7b49f0f1a6b4708604d687 (patch)
tree219382f46d86e15163d0e531228c5cc9638b44fe
parent84a3eb3743fca1f9ecde6ad75bacd16e2ed03256 (diff)
downloadnixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar.gz
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar.bz2
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar.lz
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar.xz
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.tar.zst
nixpkgs-52899ec696cb78be8d7b49f0f1a6b4708604d687.zip
scalapack: 2.1.0 -> 2.2.0
-rw-r--r--pkgs/development/libraries/science/math/scalapack/default.nix13
1 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix
index 3b1fb98a42e..155e29df6c1 100644
--- a/pkgs/development/libraries/science/math/scalapack/default.nix
+++ b/pkgs/development/libraries/science/math/scalapack/default.nix
@@ -1,22 +1,24 @@
 { lib, stdenv, fetchFromGitHub, cmake, openssh
-, gfortran, mpi, blas, lapack
+, mpi, blas, lapack
 } :
 
 assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation rec {
   pname = "scalapack";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "Reference-ScaLAPACK";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1c10d18gj3kvpmyv5q246x35hjxaqn4ygy1cygaydhyxnm4klzdj";
+    sha256 = "0hiap5i9ik6xpvl721n2slanlqygagc1pg2bcjb27ans6balhsfh";
   };
 
-  nativeBuildInputs = [ cmake openssh gfortran ];
-  buildInputs = [ mpi blas lapack ];
+  nativeBuildInputs = [ cmake ];
+  checkInputs = [ openssh ];
+  buildInputs = [ blas lapack ];
+  propagatedBuildInputs = [ mpi ];
 
   doCheck = true;
 
@@ -25,6 +27,7 @@ stdenv.mkDerivation rec {
       -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF
       -DLAPACK_LIBRARIES="-llapack"
       -DBLAS_LIBRARIES="-lblas"
+      -DCMAKE_Fortran_COMPILER=${mpi}/bin/mpif90
       )
   '';