MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

or-tools: 7.0 -> 7.3

Browse source
This commit is contained in:
Orivej Desh 2019-10-04 02:51:43 +00:00
parent 3dc70841d3
commit 2455b2e309
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/science/math/or-tools/build.patch Normal file
View file

@ -0,0 +1,5 @@
--- 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

11
pkgs/development/libraries/science/math/or-tools/default.nix
View file

@ -5,15 +5,20 @@
stdenv.mkDerivation rec {
pname = "or-tools";
version = "v7.0";
version = "7.3";
src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = version;
sha256 = "09rs2j3w4ljw9qhhnsjlvfii297njjszwvkbgj1i6kns3wnlr7cp";
rev = "v${version}";
sha256 = "0q06vxmds6nm3dpjw4y5jzr8j98qgfb9i8pbm9pfhmqigv791hwc";
};
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

10
pkgs/development/libraries/science/math/or-tools/protobuf.patch Normal file
View file

@ -0,0 +1,10 @@
--- 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