git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #107286 from doronbehar/pkg/octave/sundials
commita334367ecd1d3964627d0c0ea247f634a34b119b authorDoron Behar <doron.behar@gmail.com> dateTue 5 Jan 2021, 08:26 (6 years ago) parent9a27606442f1ec
1 file changed+32−25
pkgs/development/libraries/sundials/default.nix+32−25
pkgs/development/libraries/sundials/default.nix+32−25
@@ -1,6 +1,7 @@
11{ stdenv
22, cmake
33, fetchurl
4+, fetchpatch
45, python
56, blas
67, lapack
@@ -12,7 +13,25 @@
1213
1314stdenv.mkDerivation rec {
1415 pname = "sundials";
15− version = "5.3.0";
16+ version = "5.6.1";
17+
18+ outputs = [ "out" "examples" ];
19+
20+ src = fetchurl {
21+ url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
22+ sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM=";
23+ };
24+
25+ patches = [
26+ # Fixing an upstream regression in treating cmake prefix directories:
27+ # https://github.com/LLNL/sundials/pull/58
28+ (fetchpatch {
29+ url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch";
30+ sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc=";
31+ })
32+ ];
33+
34+ nativeBuildInputs = [ cmake ];
1635
1736 buildInputs = [
1837 python
@@ -31,36 +50,24 @@ stdenv.mkDerivation rec {
3150 suitesparse
3251 ];
3352
34− nativeBuildInputs = [ cmake ];
35−
36− src = fetchurl {
37− url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
38− sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8";
39− };
40−
41− patches = [
42− (fetchurl {
43− # https://github.com/LLNL/sundials/pull/19
44− url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
45− sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
46− })
47− ];
48−
4953 cmakeFlags = [
50− "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
54+ "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
5155 ] ++ stdenv.lib.optionals (lapackSupport) [
52− "-DLAPACK_ENABLE=ON"
56+ "-DENABLE_LAPACK=ON"
5357 "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
5458 ] ++ stdenv.lib.optionals (kluSupport) [
55− "-DKLU_ENABLE=ON"
59+ "-DENABLE_KLU=ON"
5660 "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
5761 "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
58− ] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [
59− # Use the correct index type according to lapack which is supposed to be
60− # the same index type compatible with blas, thanks to the assertion of
61− # buildInputs
62− "-DSUNDIALS_INDEX_TYPE=int32_t"
63− ]
62+ ] ++ [(
63+ # Use the correct index type according to lapack and blas used. They are
64+ # already supposed to be compatible but we check both for extra safety. 64
65+ # should be the default but we prefer to be explicit, for extra safety.
66+ if blas.isILP64 then
67+ "-DSUNDIALS_INDEX_SIZE=64"
68+ else
69+ "-DSUNDIALS_INDEX_SIZE=32"
70+ )]
6471 ;
6572
6673 doCheck = true;