diff options
author | Florian Klink <flokli@flokli.de> | 2019-12-06 02:08:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-06 02:08:56 +0100 |
commit | d3ee140e9feaa344c6ea62443501090e25ec41f3 (patch) | |
tree | 19fe143e9f83526da55f11c8f5f7f95bd899f2f9 | |
parent | 5d8bd748f305b1e53882be68072d2031b0c0b587 (diff) | |
parent | 2b78a4ec3791036b1ea8bfaea5b4df5c724242fd (diff) | |
download | nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar.gz nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar.bz2 nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar.lz nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar.xz nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.tar.zst nixpkgs-d3ee140e9feaa344c6ea62443501090e25ec41f3.zip |
Merge pull request #74988 from smaret/sundials-5.0.0
sundials: 4.1.0 -> 5.0.0
-rw-r--r-- | pkgs/development/libraries/sundials/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/libraries/sundials/tests-parallel.patch | 45 |
2 files changed, 2 insertions, 49 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 = [ diff --git a/pkgs/development/libraries/sundials/tests-parallel.patch b/pkgs/development/libraries/sundials/tests-parallel.patch deleted file mode 100644 index a785a1dade9..00000000000 --- a/pkgs/development/libraries/sundials/tests-parallel.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/config/SundialsAddTest.cmake b/config/SundialsAddTest.cmake -index e965fed..a7fb1d2 100644 ---- a/config/SundialsAddTest.cmake -+++ b/config/SundialsAddTest.cmake -@@ -70,7 +70,7 @@ MACRO(SUNDIALS_ADD_TEST NAME EXECUTABLE) - "--verbose" - "--testname=${NAME}" - "--executablename=$<TARGET_FILE:${EXECUTABLE}>" -- "--outputdir=${CMAKE_BINARY_DIR}/Testing/output" -+ "--outputdir=${TEST_OUTPUT_DIR}" - ) - - # do not diff the output and answer files -diff --git a/config/SundialsTesting.cmake b/config/SundialsTesting.cmake -index 815576a..d91801a 100644 ---- a/config/SundialsTesting.cmake -+++ b/config/SundialsTesting.cmake -@@ -29,6 +29,13 @@ IF(SUNDIALS_DEVTESTS) - ENDIF() - ENDIF() - -+ # Directory for test output -+ SET(TEST_OUTPUT_DIR ${PROJECT_BINARY_DIR}/Testing/output) -+ -+ IF(NOT EXISTS ${TEST_OUTPUT_DIR}) -+ FILE(MAKE_DIRECTORY ${TEST_OUTPUT_DIR}) -+ ENDIF() -+ - # look for the testRunner script in the test directory - FIND_PROGRAM(TESTRUNNER testRunner PATHS test) - HIDE_VARIABLE(TESTRUNNER) -diff --git a/test/testRunner b/test/testRunner -index f450ec2..f1c8deb 100755 ---- a/test/testRunner -+++ b/test/testRunner -@@ -106,7 +106,8 @@ def main(): - - # create output directory if necessary - if not os.path.exists(outDir): -- os.makedirs(outDir) -+ error("Output directory does not exist, it must be created.", outDir) -+ sys.exit(1) - elif not os.path.isdir(outDir): - error("Output directory exists but is not a directory, it must be deleted.", outDir) - sys.exit(1) |