diff options
| author | Dominic Steinitz <dominic@steinitz.org> | 2019-08-02 12:12:22 +0100 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2019-09-08 16:03:07 -0700 |
| commit | ac12bdfc96c7981226d711ac1b8d67c1683fcad1 (patch) | |
| tree | a574af43738f9df338a2767990c644458df39b10 /pkgs/development/libraries | |
| parent | 7e9e22f4d57816a74a7050a8edc0e85d63427fea (diff) | |
| download | nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar.gz nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar.bz2 nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar.lz nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar.xz nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.tar.zst nixpkgs-ac12bdfc96c7981226d711ac1b8d67c1683fcad1.zip | |
sundials: relax tolerance for test_sunmatrix_sparse
This test fails on MacOS otherwise, due to slightly different math. Only add for sundials 4, it's not in sundials_3 yet.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/sundials/3.x.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/sundials/default.nix | 17 |
2 files changed, 19 insertions, 10 deletions
diff --git a/pkgs/development/libraries/sundials/3.x.nix b/pkgs/development/libraries/sundials/3.x.nix index 999b73af7b4..6b40a7b62e6 100644 --- a/pkgs/development/libraries/sundials/3.x.nix +++ b/pkgs/development/libraries/sundials/3.x.nix @@ -22,11 +22,13 @@ in stdenv.mkDerivation rec { sha256 = "0238r1qnwqz13wcjzfsbcfi8rfnlxcjjmxq2vpf2qf5jgablvna7"; }; - patches = [ (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - })]; + 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" diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index a10ef0d4b8e..bd7a3aea7d4 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -22,11 +22,18 @@ in stdenv.mkDerivation rec { sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398"; }; - patches = [ (fetchurl { - # https://github.com/LLNL/sundials/pull/19 - url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; - sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; - })]; + patches = [ + (fetchurl { + # https://github.com/LLNL/sundials/pull/19 + url = "https://github.com/LLNL/sundials/commit/1350421eab6c5ab479de5eccf6af2dcad1eddf30.patch"; + sha256 = "0g67lixp9m85fqpb9rzz1hl1z8ibdg0ldwq5z6flj5zl8a7cw52l"; + }) + (fetchurl { + # https://github.com/LLNL/sundials/pull/20 + url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch"; + sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512"; + }) + ]; cmakeFlags = [ "-DEXAMPLES_INSTALL_PATH=${placeholder "out"}/share/examples" |