diff options
| author | Anders Kaseorg <andersk@mit.edu> | 2020-02-09 19:08:45 -0800 |
|---|---|---|
| committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-02-10 20:40:12 +0100 |
| commit | 1a32e383e6139834f1b86c1edc877fcd28f24dea (patch) | |
| tree | 577ec68e5f86abe248670f82d3bd0dde358e51a9 /pkgs/development/libraries/science/math/or-tools | |
| parent | 4e0f25d443c85f6cac415ba1602d53ca4593252a (diff) | |
| download | nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar.gz nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar.bz2 nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar.lz nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar.xz nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.tar.zst nixpkgs-1a32e383e6139834f1b86c1edc877fcd28f24dea.zip | |
or-tools: 7.3 -> 7.5
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/libraries/science/math/or-tools')
3 files changed, 10 insertions, 27 deletions
diff --git a/pkgs/development/libraries/science/math/or-tools/build.patch b/pkgs/development/libraries/science/math/or-tools/build.patch deleted file mode 100644 index a67e137ff4a..00000000000 --- a/pkgs/development/libraries/science/math/or-tools/build.patch +++ /dev/null @@ -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 diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 15aea5803bf..688d1425681 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -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; }; } diff --git a/pkgs/development/libraries/science/math/or-tools/protobuf.patch b/pkgs/development/libraries/science/math/or-tools/protobuf.patch deleted file mode 100644 index b0cce40434c..00000000000 --- a/pkgs/development/libraries/science/math/or-tools/protobuf.patch +++ /dev/null @@ -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 |