From b095728caef1a50bb9c561f367395e004ae4a1ef Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 Dec 2015 15:47:05 +0100
Subject: [PATCH] git: 2.5.2 -> 2.5.4

CVE-2015-7082.

Master is already at 2.6.3 but we don't want that on the stable
branch.
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++--
 1 file 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 2c29ce82de56..c984db424a78 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.5.2";
+  version = "2.5.4";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "16qcli3cip1ixbrxrb3hhvvgx6ppy4anig83wz7aqlfy1sln0isb";
+    sha256 = "0aj773y9jxm9pxjlwnhmamjcg5nkbknq6dbc6d6lg30w9qw2v3g0";
   };
 
   patches = [