diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-17 06:01:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-17 06:01:51 +0000 |
commit | 97d01825832a1071966c64e7f624bd3e39ddac34 (patch) | |
tree | aae6981a71e0943b48663582dc0553ca9da8289a /pkgs/development/libraries/science/math | |
parent | ba519bf3b17452d3abb828cdf86d3a4c84e7b835 (diff) | |
parent | c61915bc9615d3995d4f4dae505ae68a359eab7b (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/science/math')
-rw-r--r-- | pkgs/development/libraries/science/math/arpack/default.nix | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a418df7050eb1..744d565eddcd7 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,8 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake +{ lib, stdenv, fetchFromGitHub, cmake , gfortran, blas, lapack, eigen , useMpi ? false , mpi , openssh +, igraph }: # MPI version can only be built with LP64 interface. @@ -11,25 +12,15 @@ assert useMpi -> !blas.isILP64; stdenv.mkDerivation rec { pname = "arpack"; - version = "3.8.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "opencollab"; repo = "arpack-ng"; rev = version; - sha256 = "sha256-nc710iLRqy/p3EaVgbEoCRzNJ9GpKqqQp33tbn7R6lA="; + sha256 = "sha256-HCvapLba8oLqx9I5+KDAU0s/dTmdWOEilS75i4gyfC0="; }; - 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 gfortran ]; buildInputs = assert (blas.isILP64 == lapack.isILP64); [ blas @@ -56,10 +47,16 @@ stdenv.mkDerivation rec { install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libarpack.dylib ''; - passthru = { inherit (blas) isILP64; }; + passthru = { + inherit (blas) isILP64; + tests = { + inherit igraph; + }; + }; meta = { homepage = "https://github.com/opencollab/arpack-ng"; + changelog = "https://github.com/opencollab/arpack-ng/blob/${src.rev}/CHANGES"; description = '' A collection of Fortran77 subroutines to solve large scale eigenvalue problems. |