arpack: 3.2.0 -> 3.3.0

+10 -25
+10 -13
pkgs/development/libraries/science/math/arpack/default.nix
··· 1 - { stdenv, lib, copyPathsToStore, fetchurl, gfortran, openblas }: 1 + { stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool 2 + , gfortran, openblas }: 2 3 3 4 with stdenv.lib; 4 5 5 6 let 6 - version = "3.2.0"; 7 + version = "3.3.0"; 7 8 in 8 9 stdenv.mkDerivation { 9 10 name = "arpack-${version}"; 10 11 11 12 src = fetchurl { 12 13 url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; 13 - sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff"; 14 + sha256 = "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd"; 14 15 }; 15 16 16 - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); 17 - postPatch = '' 18 - substituteInPlace arpack.pc.in --replace "@openblas@" "${openblas}/lib" 19 - ''; 20 - 17 + nativeBuildInputs = [ autoconf automake gettext libtool ]; 21 18 buildInputs = [ gfortran openblas ]; 22 19 23 - # Auto-detection fails because gfortran brings in BLAS by default 24 - configureFlags = [ 25 - "--with-blas=-lopenblas" 26 - "--with-lapack=-lopenblas" 27 - ]; 20 + BLAS_LIBS = "-L${openblas}/lib -lopenblas"; 28 21 29 22 FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; 23 + 24 + preConfigure = '' 25 + ./bootstrap 26 + ''; 30 27 31 28 meta = { 32 29 homepage = "http://github.com/opencollab/arpack-ng";
-11
pkgs/development/libraries/science/math/arpack/openblas-libdir.patch
··· 1 - Index: arpack-ng-3.2.0/arpack.pc.in 2 - =================================================================== 3 - --- arpack-ng-3.2.0.orig/arpack.pc.in 4 - +++ arpack-ng-3.2.0/arpack.pc.in 5 - @@ -5,5 +5,5 @@ libdir=@libdir@ 6 - Name: arpack 7 - Description: ARPACK-NG 8 - Version: @PACKAGE_VERSION@ 9 - -Libs: -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@ 10 - +Libs: -L@openblas@ -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@ 11 - Cflags:
-1
pkgs/development/libraries/science/math/arpack/series
··· 1 - openblas-libdir.patch