diff options
| author | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-28 11:44:03 -0600 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@gmail.com> | 2015-12-28 11:44:03 -0600 |
| commit | 36a08ce5a0e2fea1efea62ecf518fed1eba58f3e (patch) | |
| tree | d3d0349af150a49f3ad4842f47bf4d4204bc8f33 /pkgs/development/libraries | |
| parent | 2ed4f9a342dfbc7ff690c55cd2a6037e998fd7a9 (diff) | |
| download | nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar.gz nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar.bz2 nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar.lz nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar.xz nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.tar.zst nixlib-36a08ce5a0e2fea1efea62ecf518fed1eba58f3e.zip | |
arpack: 3.2.0 -> 3.3.0
Diffstat (limited to 'pkgs/development/libraries')
3 files changed, 10 insertions, 25 deletions
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 13bf512b32d6..c9f9bcfa9a75 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/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); - postPatch = '' - substituteInPlace arpack.pc.in --replace "@openblas@" "${openblas}/lib" - ''; - + nativeBuildInputs = [ autoconf automake gettext libtool ]; buildInputs = [ gfortran openblas ]; - # Auto-detection fails because gfortran brings in BLAS by default - configureFlags = [ - "--with-blas=-lopenblas" - "--with-lapack=-lopenblas" - ]; + BLAS_LIBS = "-L${openblas}/lib -lopenblas"; FFLAGS = optional openblas.blas64 "-fdefault-integer-8"; + preConfigure = '' + ./bootstrap + ''; + meta = { homepage = "http://github.com/opencollab/arpack-ng"; description = '' diff --git a/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch b/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch deleted file mode 100644 index 421f8e85f5fc..000000000000 --- a/pkgs/development/libraries/science/math/arpack/openblas-libdir.patch +++ /dev/null @@ -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: diff --git a/pkgs/development/libraries/science/math/arpack/series b/pkgs/development/libraries/science/math/arpack/series deleted file mode 100644 index 6ac0b3286ef4..000000000000 --- a/pkgs/development/libraries/science/math/arpack/series +++ /dev/null @@ -1 +0,0 @@ -openblas-libdir.patch |