diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-30 17:18:48 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-09-30 17:19:06 +0200 |
| commit | 51c1d2d5975225be80608274cc6683c35549b8cd (patch) | |
| tree | 15cf11d844238652337a2d2fa3e214ad4f0d92da /pkgs/applications/version-management | |
| parent | fc15a0da64e4f47775d50f92330e6965a98a9e79 (diff) | |
| download | nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar.gz nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar.bz2 nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar.lz nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar.xz nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.tar.zst nixlib-51c1d2d5975225be80608274cc6683c35549b8cd.zip | |
git: Update to 1.8.4
Diffstat (limited to 'pkgs/applications/version-management')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch | 26 |
2 files changed, 14 insertions, 16 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 d88fad416dd1..fb2e34c7aac9 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -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 ]; diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch index c89842c180e6..bf36b2d321f3 100644 --- a/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch +++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch @@ -2,19 +2,19 @@ This patch does two things: (1) use the right name for `docbook2texi', and (2) make sure `gitman.info' isn't produced since it's broken (duplicate node names). -diff -u -r -w git-1.6.3.3.orig/Documentation/Makefile git-1.6.3.3/Documentation/Makefile ---- git-1.6.3.3.orig/Documentation/Makefile 2009-07-02 17:07:17.000000000 +0200 -+++ git-1.6.3.3/Documentation/Makefile 2009-07-02 17:08:49.000000000 +0200 -@@ -51,7 +51,7 @@ - infodir?=$(prefix)/share/info - MAKEINFO=makeinfo - INSTALL_INFO=install-info --DOCBOOK2X_TEXI=docbook2x-texi -+DOCBOOK2X_TEXI=docbook2texi - DBLATEX=dblatex +diff -ru git-1.8.4-orig/Documentation/Makefile git-1.8.4/Documentation/Makefile +--- git-1.8.4-orig/Documentation/Makefile 2013-08-23 21:38:43.000000000 +0200 ++++ git-1.8.4/Documentation/Makefile 2013-09-30 14:48:51.532890378 +0200 +@@ -101,7 +101,7 @@ + + MAKEINFO = makeinfo + INSTALL_INFO = install-info +-DOCBOOK2X_TEXI = docbook2x-texi ++DOCBOOK2X_TEXI = docbook2texi + DBLATEX = dblatex ifndef PERL_PATH PERL_PATH = /usr/bin/perl -@@ -153,7 +153,7 @@ +@@ -205,7 +205,7 @@ man5: $(DOC_MAN5) man7: $(DOC_MAN7) @@ -23,7 +23,7 @@ diff -u -r -w git-1.6.3.3.orig/Documentation/Makefile git-1.6.3.3/Documentation/ pdf: user-manual.pdf -@@ -169,10 +169,9 @@ +@@ -221,10 +221,9 @@ install-info: info $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) @@ -35,5 +35,3 @@ diff -u -r -w git-1.6.3.3.orig/Documentation/Makefile git-1.6.3.3/Documentation/ else \ echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ fi -Only in git-1.6.3.3/Documentation: Makefile.orig -Only in git-1.6.3.3/Documentation: Makefile.rej |