or-tools: 7.3 -> 7.5
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
parent
4e0f25d443
commit
1a32e383e6
@ -1,5 +0,0 @@
|
||||
--- a/makefiles/Makefile.python.mk
|
||||
+++ b/makefiles/Makefile.python.mk
|
||||
@@ -1070 +1070 @@ $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/data: $(PYDATA_LIBS) | $(PYPI_ARCHIVE_T
|
||||
-$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYUTIL_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
|
||||
+$(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools/util: $(PYSORTED_INTERVAL_LIST_LIBS) | $(PYPI_ARCHIVE_TEMP_DIR)/ortools/ortools
|
@ -1,24 +1,22 @@
|
||||
{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
|
||||
, lsb-release, glog, protobuf, cbc, zlib
|
||||
, ensureNewerSourcesForZipFilesHook, python, swig
|
||||
, pythonProtobuf }:
|
||||
, lsb-release, glog, protobuf3_11, cbc, zlib
|
||||
, ensureNewerSourcesForZipFilesHook, python, swig }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
protobuf = protobuf3_11;
|
||||
pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; };
|
||||
|
||||
in stdenv.mkDerivation rec {
|
||||
pname = "or-tools";
|
||||
version = "7.3";
|
||||
version = "7.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "google";
|
||||
repo = "or-tools";
|
||||
rev = "v${version}";
|
||||
sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc";
|
||||
sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac";
|
||||
};
|
||||
|
||||
patches = [
|
||||
./build.patch # https://github.com/google/or-tools/pull/1619
|
||||
./protobuf.patch # Otherwise it tries to install protobuf from pypi.
|
||||
];
|
||||
|
||||
# The original build system uses cmake which does things like pull
|
||||
# in dependencies through git and Makefile creation time. We
|
||||
# obviously don't want to do this so instead we provide the
|
||||
@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
|
||||
description = ''
|
||||
Google's software suite for combinatorial optimization.
|
||||
'';
|
||||
maintainers = with maintainers; [ ];
|
||||
maintainers = with maintainers; [ andersk ];
|
||||
platforms = with platforms; linux;
|
||||
};
|
||||
}
|
||||
|
@ -1,10 +0,0 @@
|
||||
--- a/makefiles/Makefile.third_party.unix.mk
|
||||
+++ b/makefiles/Makefile.third_party.unix.mk
|
||||
@@ -24,1 +24,1 @@ GLOG_TAG = 0.4.0
|
||||
-PROTOBUF_TAG = 3.9.0
|
||||
+PROTOBUF_TAG = 3.7.0
|
||||
--- a/makefiles/Makefile.third_party.win.mk
|
||||
+++ b/makefiles/Makefile.third_party.win.mk
|
||||
@@ -40 +40 @@ GLOG_TAG = 0.4.0
|
||||
-PROTOBUF_TAG = 3.9.0
|
||||
+PROTOBUF_TAG = 3.7.0
|
@ -24065,9 +24065,7 @@ in
|
||||
|
||||
osi = callPackage ../development/libraries/science/math/osi { };
|
||||
|
||||
or-tools = callPackage ../development/libraries/science/math/or-tools {
|
||||
pythonProtobuf = pythonPackages.protobuf;
|
||||
};
|
||||
or-tools = callPackage ../development/libraries/science/math/or-tools { };
|
||||
|
||||
rubiks = callPackage ../development/libraries/science/math/rubiks { };
|
||||
|
||||
|
@ -929,7 +929,6 @@ in {
|
||||
|
||||
ortools = (toPythonModule (pkgs.or-tools.override {
|
||||
inherit (self) python;
|
||||
pythonProtobuf = self.protobuf;
|
||||
})).python;
|
||||
|
||||
osmnx = callPackage ../development/python-modules/osmnx { };
|
||||
|
Loading…
Reference in New Issue
Block a user