tobias/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-11-10 01:33:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

or-tools: downgrade highs to 1.10.0 again (#459833)

Browse source
This commit is contained in:
Gaétan Lepage 2025-11-08 20:58:44 +00:00 committed by GitHub
parent 0aa851869e 4a0ac9806f
commit b8ca22dc7a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/by-name/or/or-tools/package.nix
View file

@ -35,6 +35,25 @@ let
python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; }; python-protobuf = python3.pkgs.protobuf5.override { inherit protobuf; };
pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; }; pybind11-protobuf = python3.pkgs.pybind11-protobuf.override { protobuf_29 = protobuf; };
# local revert of 58daf511687f191829238fc7f571e08dc9dedf56,
# working around https://github.com/google/or-tools/issues/4911
_highs = highs.overrideAttrs (old: rec {
version = "1.10.0";
src = fetchFromGitHub {
owner = "ERGO-Code";
repo = "HiGHS";
rev = "v${version}";
hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
};
# CMake Error in CMakeLists.txt:
# Imported target "highs::highs" includes non-existent path
# "/include"
# in its INTERFACE_INCLUDE_DIRECTORIES.
postPatch = ''
sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
'';
});
in in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "or-tools"; pname = "or-tools";
@ -124,7 +143,7 @@ stdenv.mkDerivation (finalAttrs: {
glpk glpk
gbenchmark gbenchmark
gtest gtest
highs _highs
python3.pkgs.absl-py python3.pkgs.absl-py
python3.pkgs.pybind11 python3.pkgs.pybind11
python3.pkgs.pybind11-abseil python3.pkgs.pybind11-abseil
@ -138,7 +157,7 @@ stdenv.mkDerivation (finalAttrs: {
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
abseil-cpp abseil-cpp
highs _highs
protobuf protobuf
python-protobuf python-protobuf
python3.pkgs.immutabledict python3.pkgs.immutabledict