diff options
author | Markus Kowalewski <markus.kowalewski@fysik.su.se> | 2019-03-05 17:17:03 +0100 |
---|---|---|
committer | Markus Kowalewski <markus.kowalewski@fysik.su.se> | 2019-04-03 10:48:52 +0200 |
commit | 9a60a65249e5d507ecfcd5f0d1825b7ac1376d58 (patch) | |
tree | 2066e26ad20b5ddc628d97a02e555201457ae755 | |
parent | 91daa7d3acd348514e780870e70b2d8cca693af8 (diff) | |
download | nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar.gz nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar.bz2 nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar.lz nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar.xz nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.tar.zst nixpkgs-9a60a65249e5d507ecfcd5f0d1825b7ac1376d58.zip |
arpack: 3.6.3 -> 3.7.0
* switch to FetchFromGitHub * switch from autotools to cmake * add eigen to input (is now required)
-rw-r--r-- | pkgs/development/libraries/science/math/arpack/default.nix | 35 |
1 files changed, 24 insertions, 11 deletions
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 2a6c4af43fc..8541384e831 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,32 +1,45 @@ -{ stdenv, fetchurl, autoconf, automake, gettext, libtool -, gfortran, openblas }: +{ stdenv, fetchFromGitHub, cmake +, gfortran, openblas, eigen }: with stdenv.lib; let - version = "3.6.3"; + version = "3.7.0"; in stdenv.mkDerivation { name = "arpack-${version}"; - src = fetchurl { - url = "https://github.com/opencollab/arpack-ng/archive/${version}.tar.gz"; - sha256 = "0lzlcsrjsi36pv5bnipwjnyg2fx3nrv31bw2klwrg11gb8g5bwv4"; + src = fetchFromGitHub { + owner = "opencollab"; + repo = "arpack-ng"; + rev = version; + sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr"; }; - nativeBuildInputs = [ autoconf automake gettext libtool ]; - buildInputs = [ gfortran openblas ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ gfortran openblas eigen ]; doCheck = true; BLAS_LIBS = "-L${openblas}/lib -lopenblas"; - INTERFACE64 = optional openblas.blas64 "1"; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + "-DINTERFACE64=${optionalString openblas.blas64 "1"}" + ]; - preConfigure = '' - ./bootstrap + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/lib + # Prevent tests from using all cores + export OMP_NUM_THREADS=2 ''; + postInstall = '' + mkdir -p $out/lib/pkgconfig + cp arpack.pc $out/lib/pkgconfig/ + ''; + + meta = { homepage = https://github.com/opencollab/arpack-ng; description = '' |