Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 884d8c4d4b59
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0d856d8b82ed
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 29, 2018

  1. Update git: 2.15.0 -> 2.15.2

    ctheune committed Jun 29, 2018
    Copy the full SHA
    d3d3ce2 View commit details
  2. Merge pull request #42767 from ctheune/ctheune-17.09-git-CVE-2018-11233

    Security update for git on 17.09: 2.15.0 -> 2.15.2
    matthewbauer authored Jun 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    0d856d8 View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 pkgs/applications/version-management/git-and-tools/git/default.nix
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
}:

let
version = "2.15.0";
version = "2.15.2";
svn = subversionClient.override { perlBindings = true; };
in

@@ -22,7 +22,7 @@ stdenv.mkDerivation {

src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "0siyxg1ppg6szjp8xp37zfq1fj97kbdxpigi3asmidqhkx41cw8h";
sha256 = "1y47y0vn0yh0f14qsiqsldv3yjnc4crwh24g1yssq15sr3h1p5ds";
};

hardeningDisable = [ "format" ];