scipopt-scip: 9.2.3 -> 9.2.4
This commit is contained in:
@@ -1,40 +0,0 @@
|
|||||||
From 7772c64ee2face1c1099c23ecbfd20ff663cffc3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Florian Klink <flokli@flokli.de>
|
|
||||||
Date: Tue, 7 Oct 2025 16:19:31 +0300
|
|
||||||
Subject: [PATCH] check: fix invalid ctest invocation
|
|
||||||
|
|
||||||
ctest doesn't like `-R "-default"`. CMake 4.0 fails with the following
|
|
||||||
error message:
|
|
||||||
|
|
||||||
> CMake Error: Invalid value used with -R
|
|
||||||
|
|
||||||
`-R` normally specifies the regex that needs to match. If none is
|
|
||||||
specified, all are selected:
|
|
||||||
|
|
||||||
https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-R
|
|
||||||
|
|
||||||
This maybe never worked, but got silently ignored until
|
|
||||||
https://cmake.org/cmake/help/latest/policy/CMP0175.html
|
|
||||||
|
|
||||||
Removing that regex should only cause *more* tests to get selected, not
|
|
||||||
less - and the build now succeeds with it.
|
|
||||||
---
|
|
||||||
check/CMakeLists.txt | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
|
|
||||||
index 0d667d5..c26b978 100644
|
|
||||||
--- a/check/CMakeLists.txt
|
|
||||||
+++ b/check/CMakeLists.txt
|
|
||||||
@@ -4,7 +4,7 @@ include(CTest)
|
|
||||||
# add a custom SCIP check target 'scip_check'
|
|
||||||
#
|
|
||||||
add_custom_target(scip_check
|
|
||||||
- COMMAND ${CMAKE_CTEST_COMMAND} -R "-default" -E "applications" --output-on-failure
|
|
||||||
+ COMMAND ${CMAKE_CTEST_COMMAND} -E "applications" --output-on-failure
|
|
||||||
DEPENDS scip
|
|
||||||
)
|
|
||||||
|
|
||||||
--
|
|
||||||
2.51.0
|
|
||||||
|
|
||||||
@@ -19,20 +19,15 @@
|
|||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "scipopt-scip";
|
pname = "scipopt-scip";
|
||||||
version = "9.2.3";
|
version = "9.2.4";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "scipopt";
|
owner = "scipopt";
|
||||||
repo = "scip";
|
repo = "scip";
|
||||||
tag = "v${lib.replaceStrings [ "." ] [ "" ] version}";
|
tag = "v${lib.replaceStrings [ "." ] [ "" ] version}";
|
||||||
hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw=";
|
hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# https://github.com/scipopt/scip/pull/169
|
|
||||||
./0001-check-fix-invalid-ctest-invocation.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
|
|||||||
Reference in New Issue
Block a user