colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: Update to 1.8.4

Browse Source
This commit is contained in:
Eelco Dolstra 2013-09-30 17:18:48 +02:00
parent fc15a0da64
commit 51c1d2d597
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -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 ];

26
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
View File

@ -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