From c4feda8b01e55dc488f9f3f82b65ef044083fdbb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 30 Nov 2018 19:09:06 -0600
Subject: or-tools: v6.9.1 -> v6.10

https://github.com/google/or-tools/releases/tag/v6.10
---
 .../libraries/science/math/or-tools/default.nix           | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix
index 5294c779a32..5c142d5f0c8 100644
--- a/pkgs/development/libraries/science/math/or-tools/default.nix
+++ b/pkgs/development/libraries/science/math/or-tools/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "or-tools-${version}";
-  version = "v6.9.1";
+  version = "v6.10";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "or-tools";
     rev = version;
-    sha256 = "099j1mc7vvry0a2fiz9zvk6divivglzphv48wbw0c6nd5w8hb27c";
+    sha256 = "11k3671rpv968dsglc6bgarr9yi8ijaaqm2wq3m0rn4wy8fj7za2";
   };
 
   # The original build system uses cmake which does things like pull
@@ -33,17 +33,6 @@ stdenv.mkDerivation rec {
     make install_cc prefix=$out
   '';
 
-  patches = [
-    # In "expected" way of compilation, the glog package is compiled
-    # with gflags support which then makes gflags header transitively
-    # included through glog. However in nixpkgs we don't compile glog
-    # with gflags so we have to include it ourselves. Upstream should
-    # always include gflags to support both ways I think.
-    #
-    # Upstream ticket: https://github.com/google/or-tools/issues/902
-    ./gflags-include.patch
-  ];
-
   nativeBuildInputs = [
     cmake lsb-release which zlib
   ];
-- 
cgit 1.4.1