summary refs log tree commit diff
path: root/pkgs/development/libraries/sundials/default.nix
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:00:06 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2019-12-10 19:01:27 +0100
commitf3618342ece994482697892133532a380a04cd0f (patch)
treebd6067d893770d9f7d272aaa5c5968ff517769d0 /pkgs/development/libraries/sundials/default.nix
parent5e7e4c93a9a93c12d5eaa3a91e289d18195aaa75 (diff)
parent2ff8cef0a4c969b9c377db4e0fe6eb8f5404e0b4 (diff)
downloadnixpkgs-f3618342ece994482697892133532a380a04cd0f.tar
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.gz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.bz2
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.lz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.xz
nixpkgs-f3618342ece994482697892133532a380a04cd0f.tar.zst
nixpkgs-f3618342ece994482697892133532a380a04cd0f.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/libraries/sundials/default.nix')
-rw-r--r--pkgs/development/libraries/sundials/default.nix6
1 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 4bc066df32e..77a7764acb8 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -12,14 +12,14 @@ let liblapackShared = liblapack.override {
 
 in stdenv.mkDerivation rec {
   pname = "sundials";
-  version = "4.1.0";
+  version = "5.0.0";
 
   buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran ];
   nativeBuildInputs = [ cmake ];
 
   src = fetchurl {
     url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-    sha256 = "19ca4nmlf6i9ijqcibyvpprxzsdfnackgjs6dw51fq13gg1f2398";
+    sha256 = "1lvx5pddjxgyr8kqlira36kxckz7nxwc8xilzfyx0hf607n42l9l";
   };
 
   patches = [
@@ -33,8 +33,6 @@ in stdenv.mkDerivation rec {
       url = "https://github.com/LLNL/sundials/pull/20/commits/2d951bbe1ff7842fcd0dafa28c61b0aa94015f66.patch";
       sha256 = "0lcr6m4lk14yqrxah4rdscpczny5l7m1zpfsjh8bgspadfsgk512";
     })
-    # https://github.com/LLNL/sundials/pull/21
-    ./tests-parallel.patch
   ];
 
   cmakeFlags = [