diff options
| author | Gabriel Ebner <gebner@gebner.org> | 2021-05-22 15:57:44 +0200 |
|---|---|---|
| committer | Gabriel Ebner <gebner@gebner.org> | 2021-05-22 16:57:32 +0200 |
| commit | a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75 (patch) | |
| tree | 369949b2b32dea8a86a5ca8ab8bcfe37883285f2 /pkgs/development/libraries/science | |
| parent | fc4f549d394b27e9ebbb5139711300d4ba586b57 (diff) | |
| download | nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar.gz nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar.bz2 nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar.lz nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar.xz nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.tar.zst nixpkgs-a6d48f9c2a8ad80a576221b7e49e0d2933fb1e75.zip | |
or-tools: 8.1 -> 9.0
Diffstat (limited to 'pkgs/development/libraries/science')
| -rw-r--r-- | pkgs/development/libraries/science/math/or-tools/default.nix | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index 2b6eb5705cd..741c6f4898b 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , cmake , abseil-cpp , bzip2 @@ -17,25 +16,16 @@ stdenv.mkDerivation rec { pname = "or-tools"; - version = "8.1"; + version = "9.0"; disabled = python.pythonOlder "3.6"; # not supported upstream src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "1zqgvkaw5vf2d8pwsa34g9jysbpiwplzxc8jyy8kdbzmj8ax3gpg"; + sha256 = "0yihrsg8wj4b82xwg1hbn97my8zqd7xhw7dk7wm2axsyvqd6m3b3"; }; - patches = [ - # This patch (on master as of Feb 11, 2021) fixes or-tools failing to respect - # USE_SCIP=OFF and then failing to find scip/scip.h - (fetchpatch { - url = "https://github.com/google/or-tools/commit/17321869832b5adaccd9864e7e5576122730a5d5.patch"; - sha256 = "0bi2z1hqlpdm1if3xa5dzc2zv0qlm5xi2x979brx10f8k779ghn0"; - }) - ]; - # 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 |