Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9a27606ab178
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a334367ecd1d
Choose a head ref
  • 4 commits
  • 1 file changed
  • 1 contributor

Commits on Jan 4, 2021

  1. sundials: 5.3.0 -> 5.6.1 

    Update some cmake flags and be more explicit regarding index size.
    @doronbehar
    doronbehar committed Jan 4, 2021
    Copy the full SHA
    da3f98c View commit details

  2. sundials: Split outputs for examples

    @doronbehar
    doronbehar committed Jan 4, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    12c9f36 View commit details

  3. sundials: reorder attributes 

    Per
https://github.com/jtojnar/nixpkgs-hammering/blob/master/explanations/attribute-ordering.md
    @doronbehar
    doronbehar committed Jan 4, 2021
    Copy the full SHA
    442f1ec View commit details

Commits on Jan 5, 2021

  1. Merge pull request #107286 from doronbehar/pkg/octave/sundials

    @doronbehar
    doronbehar authored Jan 5, 2021
    Copy the full SHA
    a334367 View commit details
Showing with 32 additions and 25 deletions.
  1. +32 −25 pkgs/development/libraries/sundials/default.nix
57 changes: 32 additions & 25 deletions pkgs/development/libraries/sundials/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ stdenv
, cmake
, fetchurl
, fetchpatch
, python
, blas
, lapack
@@ -12,7 +13,25 @@

stdenv.mkDerivation rec {
pname = "sundials";
version = "5.3.0";
version = "5.6.1";

outputs = [ "out" "examples" ];

src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "Frd5mex+fyFXqh0Eyh3kojccqBUOBW0klR0MWJZvKoM=";
};

patches = [
# Fixing an upstream regression in treating cmake prefix directories:
# https://github.com/LLNL/sundials/pull/58
(fetchpatch {
url = "https://github.com/LLNL/sundials/commit/dd32ff9baa05618f36e44aadb420bbae4236ea1e.patch";
sha256 = "kToAuma+2iHFyL1v/l29F3+nug4AdK5cPG6IcXv2afc=";
})
];

nativeBuildInputs = [ cmake ];

buildInputs = [
python
@@ -31,36 +50,24 @@ stdenv.mkDerivation rec {
suitesparse
];

nativeBuildInputs = [ cmake ];

src = fetchurl {
url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
sha256 = "19xwi7pz35s2nqgldm6r0jl2k0bs36zhbpnmmzc56s1n3bhzgpw8";
};

patches = [
(fetchurl {
# https://github.com/LLNL/sundials/pull/19
url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch";
sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l";
})
];

cmakeFlags = [
"-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples"
"-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
] ++ stdenv.lib.optionals (lapackSupport) [
"-DLAPACK_ENABLE=ON"
"-DENABLE_LAPACK=ON"
"-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
] ++ stdenv.lib.optionals (kluSupport) [
"-DKLU_ENABLE=ON"
"-DENABLE_KLU=ON"
"-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
"-DKLU_LIBRARY_DIR=${suitesparse}/lib"
] ++ stdenv.lib.optionals (lapackSupport && !lapack.isILP64) [
# Use the correct index type according to lapack which is supposed to be
# the same index type compatible with blas, thanks to the assertion of
# buildInputs
"-DSUNDIALS_INDEX_TYPE=int32_t"
]
] ++ [(
# Use the correct index type according to lapack and blas used. They are
# already supposed to be compatible but we check both for extra safety. 64
# should be the default but we prefer to be explicit, for extra safety.
if blas.isILP64 then
"-DSUNDIALS_INDEX_SIZE=64"
else
"-DSUNDIALS_INDEX_SIZE=32"
)]
;

doCheck = true;