MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #74988 from smaret/sundials-5.0.0

Browse source 
sundials: 4.1.0 -> 5.0.0
This commit is contained in:
Florian Klink 2019-12-06 02:08:56 +01:00 committed by GitHub
commit d3ee140e9f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/development/libraries/sundials/default.nix
View file

@ -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 = [

45
pkgs/development/libraries/sundials/tests-parallel.patch
View file

@ -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)