Merge pull request #117685 from dotlambda/arpack-3.8.0

arpack: 3.7.0 -> 3.8.0
This commit is contained in:
Doron Behar 2021-03-27 11:09:44 +00:00 committed by GitHub
commit 20826f0710
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,17 +1,27 @@
{ lib, stdenv, fetchFromGitHub, cmake { lib, stdenv, fetchFromGitHub, fetchpatch, cmake
, gfortran, blas, lapack, eigen }: , gfortran, blas, lapack, eigen }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "arpack"; pname = "arpack";
version = "3.7.0"; version = "3.8.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "opencollab"; owner = "opencollab";
repo = "arpack-ng"; repo = "arpack-ng";
rev = version; rev = version;
sha256 = "1x7a1dj3dg43nlpvjlh8jzzbadjyr3mbias6f0256qkmgdyk4izr"; sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA=";
}; };
patches = [
# https://github.com/opencollab/arpack-ng/pull/301
(fetchpatch {
name = "pkg-config-paths.patch";
url = "https://github.com/opencollab/arpack-ng/commit/47fc83cb371a9cc8a8c058097de5e0298cd548f5.patch";
excludes = [ "CHANGES" ];
sha256 = "1aijvrfsxkgzqmkzq2dmaj8q3jdpg2hwlqpfl8ddk9scv17gh9m8";
})
];
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
buildInputs = assert (blas.isILP64 == lapack.isILP64); [ buildInputs = assert (blas.isILP64 == lapack.isILP64); [
gfortran gfortran
@ -24,7 +34,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON" "-DBUILD_SHARED_LIBS=ON"
"-DINTERFACE64=${lib.optionalString blas.isILP64 "1"}" "-DINTERFACE64=${if blas.isILP64 then "1" else "0"}"
]; ];
preCheck = if stdenv.isDarwin then '' preCheck = if stdenv.isDarwin then ''
@ -36,12 +46,6 @@ stdenv.mkDerivation rec {
export OMP_NUM_THREADS=2 export OMP_NUM_THREADS=2
''; '';
postInstall = ''
mkdir -p $out/lib/pkgconfig
cp arpack.pc $out/lib/pkgconfig/
'';
meta = { meta = {
homepage = "https://github.com/opencollab/arpack-ng"; homepage = "https://github.com/opencollab/arpack-ng";
description = '' description = ''
@ -49,7 +53,7 @@ stdenv.mkDerivation rec {
problems. problems.
''; '';
license = lib.licenses.bsd3; license = lib.licenses.bsd3;
maintainers = [ lib.maintainers.ttuegel ]; maintainers = with lib.maintainers; [ ttuegel dotlambda ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
} }