diff options
| -rw-r--r-- | pkgs/applications/version-management/git/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/version-management/git/docbook2texi.patch | 36 |
2 files changed, 40 insertions, 2 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index 7ca20e8a8d59b..002c634b636fe 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -3,13 +3,15 @@ , libxslt }: stdenv.mkDerivation rec { - name = "git-1.5.4.2"; + name = "git-1.5.4.4"; src = fetchurl { url = "mirror://kernel/software/scm/git/${name}.tar.bz2"; - sha256 = "089n3da06k19gzhacsqgaamgx5hy5r50r2b4a626s87w44mj78sn"; + sha256 = "16dcmkj7dfmr1cy28hi0ipc2qx7dy3knnb77w5bn78hwdfd2dcv9"; }; + patches = [ ./docbook2texi.patch ]; + buildInputs = [curl openssl zlib expat gettext] ++ (if emacs != null then [emacs] else []) ++ # documentation tools diff --git a/pkgs/applications/version-management/git/docbook2texi.patch b/pkgs/applications/version-management/git/docbook2texi.patch new file mode 100644 index 0000000000000..4c26a10a72daf --- /dev/null +++ b/pkgs/applications/version-management/git/docbook2texi.patch @@ -0,0 +1,36 @@ +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). + +--- git-1.5.4.4/Documentation/Makefile~ 2008-03-09 11:18:13.000000000 +0100 ++++ git-1.5.4.4/Documentation/Makefile 2008-03-12 16:04:05.000000000 +0100 +@@ -53,7 +53,7 @@ DOC_REF = origin/man + infodir?=$(prefix)/share/info + MAKEINFO=makeinfo + INSTALL_INFO=install-info +-DOCBOOK2X_TEXI=docbook2x-texi ++DOCBOOK2X_TEXI=docbook2texi + ifndef PERL_PATH + PERL_PATH = /usr/bin/perl + endif +@@ -89,7 +89,7 @@ man1: $(DOC_MAN1) + man5: $(DOC_MAN5) + man7: $(DOC_MAN7) + +-info: git.info gitman.info ++info: git.info + + install: man + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) +@@ -101,10 +101,9 @@ install: man + + install-info: info + $(INSTALL) -d -m 755 $(DESTDIR)$(infodir) +- $(INSTALL) -m 644 git.info gitman.info $(DESTDIR)$(infodir) ++ $(INSTALL) -m 644 git.info $(DESTDIR)$(infodir) + if test -r $(DESTDIR)$(infodir)/dir; then \ + $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) git.info ;\ +- $(INSTALL_INFO) --info-dir=$(DESTDIR)$(infodir) gitman.info ;\ + else \ + echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ + fi |