summary refs log tree commit diff
path: root/pkgs/development/libraries/science/math/or-tools
diff options
context:
space:
mode:
authorPavol Rusnak <pavol@rusnak.io>2020-06-24 21:48:01 +0200
committerPavol Rusnak <pavol@rusnak.io>2020-07-26 15:34:17 +0200
commit7839270bb0bd12897e1e6ec67d0f851caacefb3c (patch)
tree9629ee53a7e6e7caa29b06c1d0086d380cc63df6 /pkgs/development/libraries/science/math/or-tools
parentc09f880fc3c406e7e6b9103cd65eb81d5019f428 (diff)
downloadnixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar.gz
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar.bz2
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar.lz
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar.xz
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.tar.zst
nixpkgs-7839270bb0bd12897e1e6ec67d0f851caacefb3c.zip
or-tools: 7.6 -> 7.7
Diffstat (limited to 'pkgs/development/libraries/science/math/or-tools')
-rw-r--r--pkgs/development/libraries/science/math/or-tools/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index a69ae5af15f..926f7ba4789 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -1,20 +1,16 @@
 { stdenv, fetchFromGitHub, cmake, abseil-cpp, gflags, which
-, lsb-release, glog, protobuf3_11, cbc, zlib
+, lsb-release, glog, protobuf, cbc, zlib
 , ensureNewerSourcesForZipFilesHook, python, swig }:
 
-let
-  protobuf = protobuf3_11;
-  pythonProtobuf = python.pkgs.protobuf.override { inherit protobuf; };
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "or-tools";
-  version = "7.6";
+  version = "7.7";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = "v${version}";
-    sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b";
+    sha256 = "06ig9a1afmzgzcg817y0rdq49ahll0q9y7bhhg9d89x6zy959ypv";
   };
 
   # The original build system uses cmake which does things like pull
@@ -33,7 +29,7 @@ in stdenv.mkDerivation rec {
 
   makeFlags = [
     "prefix=${placeholder "out"}"
-    "PROTOBUF_PYTHON_DESC=${pythonProtobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
+    "PROTOBUF_PYTHON_DESC=${python.pkgs.protobuf}/${python.sitePackages}/google/protobuf/descriptor_pb2.py"
   ];
   buildFlags = [ "cc" "pypi_archive" ];
 
@@ -54,7 +50,7 @@ in stdenv.mkDerivation rec {
   ];
   propagatedBuildInputs = [
     abseil-cpp gflags glog protobuf cbc
-    pythonProtobuf python.pkgs.six
+    python.pkgs.protobuf python.pkgs.six
   ];
 
   enableParallelBuilding = true;