arpack: 3.2.0 -> 3.3.0

pkgs/development/libraries/science/math/arpack/default.nix

@@ -1,33 +1,30 @@
-{ stdenv, lib, copyPathsToStore, fetchurl, gfortran, openblas }:
+{ stdenv, lib, copyPathsToStore, fetchurl, autoconf, automake, gettext, libtool
+, gfortran, openblas }:
 
 with stdenv.lib;
 
 let
-  version = "3.2.0";
+  version = "3.3.0";
 in
 stdenv.mkDerivation {
   name = "arpack-${version}";
 
   src = fetchurl {
     url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz";
-    sha256 = "1fwch6vipms1ispzg2djvbzv5wag36f1dmmr3xs3mbp6imfyhvff";
+    sha256 = "1cz53wqzcf6czmcpfb3vb61xi0rn5bwhinczl65hpmbrglg82ndd";
   };
 
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ autoconf automake gettext libtool ];
-  postPatch = ''
-    substituteInPlace arpack.pc.in --replace "@openblas@" "${openblas}/lib"
-  '';
-
   buildInputs = [ gfortran openblas ];
 
-  # Auto-detection fails because gfortran brings in BLAS by default
+  BLAS_LIBS = "-L${openblas}/lib -lopenblas";
-  configureFlags = [
-    "--with-blas=-lopenblas"
-    "--with-lapack=-lopenblas"
-  ];
 
   FFLAGS = optional openblas.blas64 "-fdefault-integer-8";
 
+  preConfigure = ''
+    ./bootstrap
+  '';
+
   meta = {
     homepage = "http://github.com/opencollab/arpack-ng";
     description = ''

pkgs/development/libraries/science/math/arpack/openblas-libdir.patch

@@ -1,11 +0,0 @@
-Index: arpack-ng-3.2.0/arpack.pc.in
-===================================================================
---- arpack-ng-3.2.0.orig/arpack.pc.in
-+++ arpack-ng-3.2.0/arpack.pc.in
-@@ -5,5 +5,5 @@ libdir=@libdir@
- Name: arpack
- Description: ARPACK-NG 
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@
-+Libs: -L@openblas@ -L${libdir} -larpack @BLAS_LIBS@ @LAPACK_LIBS@
- Cflags: 

pkgs/development/libraries/science/math/arpack/series

@@ -1 +0,0 @@
-openblas-libdir.patch