gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

or-tools: 9.11 -> 9.12 (#391978)

Browse Source
This commit is contained in:
Weijia Wang
2025-03-28 14:00:30 +01:00
committed by GitHub
parent 5c29fd7d13 44a28f26c8
commit 71d127da24
3 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/science/math/or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch
+41
View File
@@ -0,0 +1,41 @@
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -322,7 +322,6 @@
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/linear_solver/python/__init__.py CONTENT "")
if(BUILD_MATH_OPT)
- file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/../pybind11_abseil/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/__init__.py CONTENT "")
file(GENERATE OUTPUT ${PYTHON_PROJECT_DIR}/math_opt/core/python/__init__.py CONTENT "")
@@ -635,9 +634,6 @@
COMMAND ${CMAKE_COMMAND} -E
$<IF:$<BOOL:${BUILD_MATH_OPT}>,copy,true>
$<TARGET_FILE:math_opt_pybind11> ${PYTHON_PROJECT}/math_opt/core/python
- COMMAND ${CMAKE_COMMAND} -E
- $<IF:$<BOOL:${BUILD_MATH_OPT}>,copy,true>
- $<TARGET_FILE:status_py_extension_stub> ${PYTHON_PROJECT}/../pybind11_abseil
COMMAND ${CMAKE_COMMAND} -E
$<IF:$<TARGET_EXISTS:pdlp_pybind11>,copy,true>
$<$<TARGET_EXISTS:pdlp_pybind11>:$<TARGET_FILE:pdlp_pybind11>> ${PYTHON_PROJECT}/pdlp/python
@@ -696,7 +692,6 @@
COMMAND ${stubgen_EXECUTABLE} -p ortools.constraint_solver.pywrapcp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.pywraplp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.linear_solver.python.model_builder_helper --output .
- COMMAND ${stubgen_EXECUTABLE} -p pybind11_abseil.status --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.math_opt.core.python.solver --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.pdlp.python.pdlp --output .
COMMAND ${stubgen_EXECUTABLE} -p ortools.sat.python.cp_model_helper --output .
--- a/ortools/python/setup.py.in
+++ b/ortools/python/setup.py.in
@@ -83,10 +83,6 @@
'*.pyi',
'py.typed'
],
- 'pybind11_abseil':[
- '$<TARGET_FILE_NAME:status_py_extension_stub>',
- '*.pyi'
- ],
'@PYTHON_PROJECT@.math_opt':['*.pyi'],
'@PYTHON_PROJECT@.math_opt.core.python':[
'$<TARGET_FILE_NAME:math_opt_pybind11>',
pkgs/development/libraries/science/math/or-tools/default.nix
+4 -7
View File
@@ -23,21 +23,18 @@
stdenv.mkDerivation rec {
pname = "or-tools";
version = "9.11";
version = "9.12";
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
tag = "v${version}";
hash = "sha256-aRhUAs9Otvra7VPJvrf0fhDCGpYhOw1//BC4dFJ7/xI=";
hash = "sha256-5rFeAK51+BfjIyu/5f5ptaKMD7Hd20yHa2Vj3O3PkLU=";
};
patches = [
(fetchpatch {
name = "0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch";
url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=19";
hash = "sha256-QHQ9E3mhTznJVKB+nP/9jct3uz+SPcOZ7w5tjOQ8iuk=";
})
# Rebased from https://build.opensuse.org/public/source/science/google-or-tools/0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch?rev=19
./0001-Do-not-try-to-copy-pybind11_abseil-status-extension-.patch
(fetchpatch {
name = "0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch";
url = "https://build.opensuse.org/public/source/science/google-or-tools/0001-Revert-python-Fix-python-install-on-windows-breaks-L.patch?rev=19";
pkgs/top-level/all-packages.nix
+2 -7
View File
@@ -16515,15 +16515,10 @@ with pkgs;
or-tools = callPackage ../development/libraries/science/math/or-tools {
inherit (darwin) DarwinTools;
python = python3;
protobuf = protobuf_26.override {
protobuf = protobuf_29.override {
abseil-cpp = abseil-cpp_202407;
};
# or-tools builds with -std=c++17, so abseil-cpp must
# also be built that way
abseil-cpp = abseil-cpp_202407.override {
static = true;
cxxStandard = "17";
};
abseil-cpp = abseil-cpp_202407;
};
p4est-sc = callPackage ../development/libraries/science/math/p4est-sc {