scipopt-gcg: 372 -> 372-unstable-2025-10-11, scipopt-scip: 9.2.3 -> 9.2.4, scipopt-papilo: 2.4.3 -> 2.4.4, scipopt-{soplex, ug, zimpl}: update scipVersion (#455397)
This commit is contained in:
@@ -13,16 +13,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scipopt-gcg";
|
||||
version = "372";
|
||||
version = "372-unstable-2025-10-11";
|
||||
|
||||
# To correlate scipVersion and version, check: https://scipopt.org/#news
|
||||
scipVersion = "9.2.3";
|
||||
scipVersion = "9.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "gcg";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-Sx0ZSca7XBT4GqxWt3bzelaXlI7kZCJo+by22mtTFhA=";
|
||||
rev = "83a2d210a03f920dd941d547da94867deb504882";
|
||||
hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
@@ -53,6 +53,12 @@ stdenv.mkDerivation rec {
|
||||
)
|
||||
'';
|
||||
doCheck = true;
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt \
|
||||
--replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
|
||||
'';
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ fettgoenner ];
|
||||
changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
|
||||
|
||||
@@ -12,16 +12,16 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "scipopt-papilo";
|
||||
version = "2.4.3";
|
||||
version = "2.4.4";
|
||||
|
||||
# To correlate scipVersion and version, check: https://scipopt.org/#news
|
||||
scipVersion = "9.2.3";
|
||||
scipVersion = "9.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "papilo";
|
||||
tag = "v${version}";
|
||||
hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8=";
|
||||
hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
@@ -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 {
|
||||
pname = "scipopt-scip";
|
||||
version = "9.2.3";
|
||||
version = "9.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "scip";
|
||||
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 ];
|
||||
|
||||
buildInputs = [
|
||||
|
||||
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
version = "7.1.5";
|
||||
|
||||
# To correlate scipVersion and version, check: https://scipopt.org/#news
|
||||
scipVersion = "9.2.3";
|
||||
scipVersion = "9.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
|
||||
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
|
||||
version = "1.0.0-beta6";
|
||||
|
||||
# To correlate scipVersion and version, check: https://scipopt.org/#news
|
||||
scipVersion = "9.2.3";
|
||||
scipVersion = "9.2.4";
|
||||
|
||||
# Take the SCIPOptSuite source since no other source exists publicly.
|
||||
src = fetchzip {
|
||||
url = "https://github.com/scipopt/scip/releases/download/v${
|
||||
lib.replaceStrings [ "." ] [ "" ] scipVersion
|
||||
}/scipoptsuite-${scipVersion}.tgz";
|
||||
sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE=";
|
||||
hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0=";
|
||||
};
|
||||
|
||||
sourceRoot = "${src.name}/ug";
|
||||
|
||||
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
|
||||
version = "362";
|
||||
|
||||
# To correlate scipVersion and version, check: https://scipopt.org/#news
|
||||
scipVersion = "9.2.3";
|
||||
scipVersion = "9.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "scipopt";
|
||||
repo = "zimpl";
|
||||
tag = "v${version}";
|
||||
sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o=";
|
||||
hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user