diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-11-17 11:12:47 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-11-17 11:14:05 +0100 |
| commit | 5af7b823364e485d7c3352151f86e5246d185db4 (patch) | |
| tree | 67baca3942a03c7ebd8715e58182c09884b3cac1 /pkgs/applications/version-management | |
| parent | b5e89fe9bf52e3c0e1b305c326c39319276761f6 (diff) | |
| parent | ba73dbbda61b14ec8e2ca0ab526d3b35ba1db74c (diff) | |
| download | nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar.gz nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar.bz2 nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar.lz nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar.xz nixlib-5af7b823364e485d7c3352151f86e5246d185db4.tar.zst nixlib-5af7b823364e485d7c3352151f86e5246d185db4.zip | |
Merge branch 'master' into staging
To incorporate some larger security rebuilds (jasper).
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index e432543df452..9c44d420c136 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.10.1"; + version = "2.10.2"; svn = subversionClient.override { perlBindings = true; }; in @@ -20,7 +20,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; + sha256 = "0wc64dzcxrzgi6kwcljz6y3cwm3ajdgf6aws7g58azbhvl1jk04l"; }; hardeningDisable = [ "format" ]; |