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

or-tools: 7.3 -> 7.5

Browse Source 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg 2020-02-09 19:08:45 -08:00 committed by Frederik Rietdijk
parent 4e0f25d443
commit 1a32e383e6
5 changed files with 11 additions and 31 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
View File

@ -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

22
pkgs/development/libraries/science/math/or-tools/default.nix
View File

@ -1,24 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
, lsb-release, glog, protobuf, cbc, zlib , lsb-release, glog, protobuf3_11, cbc, zlib
, ensureNewerSourcesForZipFilesHook, python, swig , ensureNewerSourcesForZipFilesHook, python, swig }:
, pythonProtobuf }:
stdenv.mkDerivation rec { let
protobuf = protobuf3_11;
pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; };
in stdenv.mkDerivation rec {
pname = "or-tools"; pname = "or-tools";
version = "7.3"; version = "7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = "v${version}"; 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 # The original build system uses cmake which does things like pull
# in dependencies through git and Makefile creation time. We # in dependencies through git and Makefile creation time. We
# obviously don't want to do this so instead we provide the # obviously don't want to do this so instead we provide the
@ -69,7 +67,7 @@ stdenv.mkDerivation rec {
description = '' description = ''
Google's software suite for combinatorial optimization. Google's software suite for combinatorial optimization.
''; '';
maintainers = with maintainers; [ ]; maintainers = with maintainers; [ andersk ];
platforms = with platforms; linux; platforms = with platforms; linux;
}; };
} }

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

@ -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

4
pkgs/top-level/all-packages.nix
View File

@ -24065,9 +24065,7 @@ in
osi = callPackage ../development/libraries/science/math/osi { }; osi = callPackage ../development/libraries/science/math/osi { };
or-tools = callPackage ../development/libraries/science/math/or-tools { or-tools = callPackage ../development/libraries/science/math/or-tools { };
pythonProtobuf = pythonPackages.protobuf;
};
rubiks = callPackage ../development/libraries/science/math/rubiks { }; rubiks = callPackage ../development/libraries/science/math/rubiks { };

1
pkgs/top-level/python-packages.nix
View File

@ -929,7 +929,6 @@ in {
ortools = (toPythonModule (pkgs.or-tools.override { ortools = (toPythonModule (pkgs.or-tools.override {
inherit (self) python; inherit (self) python;
pythonProtobuf = self.protobuf;
})).python; })).python;
osmnx = callPackage ../development/python-modules/osmnx { }; osmnx = callPackage ../development/python-modules/osmnx { };