Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-03-28 15:16:29 +00:00
parent 3f45f0948d c61445357e
commit f60c9df0ba
628 changed files with 60034 additions and 8180 deletions
@@ -9,7 +9,7 @@
 }:

 let
-  version = "2.7.1";
+  version = "2.7.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 = "1zkbdmh5gvxalr8l1cwnirqq5raijmp2d0s36s6qabrlvqvq2yj7";
+    sha256 = "0ys55v2xrhzj74jrrqx75xpr458klnyxshh8d8swfpp0zgg79rfy";
  };

  hardeningDisable = [ "format" ];