Merge remote-tracking branch 'origin/master' into stdenv-updates.

2013-10-02 22:44:12 +02:00
parent b15c3e49e5 1d03574722
commit ac5d5297dd
175 changed files with 3016 additions and 1052 deletions
@@ -10,7 +10,7 @@

 let

-  version = "1.8.3.4";
+  version = "1.8.4";

  svn = subversionClient.override { perlBindings = true; };

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

  src = fetchurl {
    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "1nfr4hgqs3b6k9wanqcix0wlw71q61h5irxiavlspd4jvzrcv8nz";
+    sha256 = "156bwqqgaw65rsvbb4wih5jfg94bxyf6p16mdwf0ky3f4ln55s2i";
  };

  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];