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

Merge pull request #86755 from andersk/abseil-ortools

Browse Source 
abseil-cpp: 20191119 -> 20200225.2; or-tools: 7.5 -> 7.6
This commit is contained in:
Mario Rodas
2020-05-07 06:53:54 -05:00
committed by GitHub
parent 3439ec9695 7a17b13b48
commit a340a9f4d8
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/abseil-cpp/default.nix
+4 -5
View File
@@ -2,15 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abseil-cpp"; pname = "abseil-cpp";
date = "20191119"; version = "20200225.2";
rev = "8ba96a8244bbe334d09542e92d566673a65c1f78";
version = "${date}-${rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "abseil"; owner = "abseil";
repo = "abseil-cpp"; repo = "abseil-cpp";
rev = rev; rev = version;
sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
@@ -19,6 +17,7 @@ stdenv.mkDerivation rec {
description = "An open-source collection of C++ code designed to augment the C++ standard library"; description = "An open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/"; homepage = "https://abseil.io/";
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ]; maintainers = [ maintainers.andersk ];
}; };
} }
pkgs/development/libraries/science/math/or-tools/default.nix
+2 -2
View File
@@ -8,13 +8,13 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "or-tools"; pname = "or-tools";
version = "7.5"; version = "7.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "google"; owner = "google";
repo = "or-tools"; repo = "or-tools";
rev = "v${version}"; rev = "v${version}";
sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b";
}; };
# The original build system uses cmake which does things like pull # The original build system uses cmake which does things like pull