Merge branch 'master.upstream' into staging.upstream

2015-06-18 22:37:00 -07:00
parent 0967c0fcdb c64747c44a
commit fe4f8903b4
22 changed files with 69 additions and 73 deletions
@@ -9,7 +9,7 @@
 }:

 let
-  version = "2.4.2";
+  version = "2.4.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 = "1rf942v2yk49xgy0asgk4vi4mmshpz823iyvrxc5n5y2v0ffq0a8";
+    sha256 = "0q02ygsk1gvn07bb7gnwrp9kr2p405fjj8arpby7851889fv2wzq";
  };

  patches = [