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

or-tools: 8.1 -> 9.0

Browse Source
This commit is contained in:
Gabriel Ebner 2021-05-22 15:57:44 +02:00
parent fc4f549d39
commit a6d48f9c2a
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,6 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, abseil-cpp , abseil-cpp
, bzip2 , bzip2
@ -17,25 +16,16 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "or-tools"; pname = "or-tools";
version = "8.1"; version = "9.0";
disabled = python.pythonOlder "3.6"; # not supported upstream disabled = python.pythonOlder "3.6"; # not supported upstream
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = "v${version}"; 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 # 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