alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Updated git to version 1.6.3.3.

Browse source 
The fill-paragraph patch is obsolete; it's now part of the distribution.

svn path=/nixpkgs/trunk/; revision=16148
This commit is contained in:
Peter Simons 2009-07-02 15:41:58 +00:00
parent 2d10c04eff
commit 5e7f7822f8
3 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/version-management/git-and-tools/git/default.nix
View file

@ -8,16 +8,15 @@
# `git-svn' support requires Subversion and various Perl libraries.
assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBindings);
stdenv.mkDerivation rec {
name = "git-1.6.1.3";
name = "git-1.6.3.3";
src = fetchurl {
url = "mirror://kernel/software/scm/git/${name}.tar.bz2";
sha256 = "aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682";
sha256 = "f94bc0d1fc861a12c7fb821b27a4e6a80901e84432cdb7894cb7a437d4c939ad";
};
patches = [ ./docbook2texi.patch ./fill-paragraph.patch ];
patches = [ ./docbook2texi.patch ];
buildInputs = [curl openssl zlib expat gettext cpio makeWrapper]
++ # documentation tools

24
pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
View file

@ -1,29 +1,25 @@
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 --git a/Documentation/Makefile b/Documentation/Makefile
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -48,7 +48,7 @@ DOC_REF = origin/man
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
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
@@ -84,7 +84,7 @@ man1: $(DOC_MAN1)
@@ -153,7 +153,7 @@
man5: $(DOC_MAN5)
man7: $(DOC_MAN7)
-info: git.info gitman.info
+info: git.info
install: man
$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
@@ -96,10 +96,9 @@ install: man
pdf: user-manual.pdf
@@ -169,10 +169,9 @@
install-info: info
$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)
@ -35,3 +31,5 @@ diff --git a/Documentation/Makefile b/Documentation/Makefile
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

11
pkgs/applications/version-management/git-and-tools/git/fill-paragraph.patch
View file

@ -1,11 +0,0 @@
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 3c37d0d..e314c44 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -1331,6 +1331,7 @@ Return the list of files that haven't been handled."
(log-edit-diff-function . git-log-edit-diff)) buffer)
(log-edit 'git-do-commit nil 'git-log-edit-files buffer))
(setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
+ (setq paragraph-separate (concat (regexp-quote git-log-msg-separator) "$\\|Author: \\|Date: \\|Merge: \\|Signed-off-by: \\|\f\\|[ ]*$"))
(setq buffer-file-coding-system coding-system)
(re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))