Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3439ec9695da
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a340a9f4d899
Choose a head ref
  • 3 commits
  • 2 files changed
  • 3 contributors

Commits on May 4, 2020

  1. abseil-cpp: 20191119 -> 20200225.2 

    Signed-off-by: Anders Kaseorg <andersk@mit.edu>
    @andersk
    andersk committed May 4, 2020
    Copy the full SHA
    6356c04 View commit details

  2. or-tools: 7.5 -> 7.6

    @r-ryantm @andersk
    r-ryantm authored and andersk committed May 4, 2020
    Copy the full SHA
    7a17b13 View commit details

Commits on May 7, 2020

  1. Merge pull request #86755 from andersk/abseil-ortools 

    abseil-cpp: 20191119 -> 20200225.2; or-tools: 7.5 -> 7.6
    @marsam
    marsam authored May 7, 2020
    Copy the full SHA
    a340a9f View commit details
Showing with 6 additions and 7 deletions.
  1. +4 −5 pkgs/development/libraries/abseil-cpp/default.nix
  2. +2 −2 pkgs/development/libraries/science/math/or-tools/default.nix
9 changes: 4 additions & 5 deletions pkgs/development/libraries/abseil-cpp/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,15 +2,13 @@

stdenv.mkDerivation rec {
pname = "abseil-cpp";
date = "20191119";
rev = "8ba96a8244bbe334d09542e92d566673a65c1f78";
version = "${date}-${rev}";
version = "20200225.2";

src = fetchFromGitHub {
owner = "abseil";
repo = "abseil-cpp";
rev = rev;
sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb";
rev = version;
sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y";
};

nativeBuildInputs = [ cmake ];
@@ -19,6 +17,7 @@ stdenv.mkDerivation rec {
description = "An open-source collection of C++ code designed to augment the C++ standard library";
homepage = "https://abseil.io/";
license = licenses.asl20;
platforms = platforms.all;
maintainers = [ maintainers.andersk ];
};
}
4 changes: 2 additions & 2 deletions pkgs/development/libraries/science/math/or-tools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@ let

in stdenv.mkDerivation rec {
pname = "or-tools";
version = "7.5";
version = "7.6";

src = fetchFromGitHub {
owner = "google";
repo = "or-tools";
rev = "v${version}";
sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac";
sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b";
};

# The original build system uses cmake which does things like pull