adding gitAttr

now containing qgit, stgit, topGit, hg2git
updating gitGit (git dev version), adding qgit-git (dev version)

svn path=/nixpkgs/trunk/; revision=13816

12 files changed, 140 insertions, 42 deletions

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
new file mode 100644
index 000000000000..9506e7a5f0ef
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -0,0 +1,71 @@
+/* moving all git tools into one attribute set because git is unlikely to be
+ * referenced by other packages and you can get a fast overview.
+*/
+args: with args; with pkgs;
+let
+  inherit (pkgs) stdenv fetchurl getConfig;
+  inherit (pkgs.bleedingEdgeRepos) sourceByName;
+in
+rec {
+
+  git = import ./git {
+    inherit fetchurl stdenv curl openssl zlib expat perl gettext
+      asciidoc texinfo xmlto docbook2x
+      docbook_xsl docbook_xml_dtd_42 libxslt
+      cpio tcl tk makeWrapper subversion;
+    svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
+    guiSupport = getConfig ["git" "guiSupport"] false;
+    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+  };
+
+  gitGit = import ./git/git-git.nix {
+    inherit fetchurl stdenv curl openssl zlib expat perl gettext
+      asciidoc texinfo xmlto docbook2x
+      docbook_xsl docbook_xml_dtd_42 libxslt
+      cpio tcl tk makeWrapper subversion autoconf;
+    inherit (bleedingEdgeRepos) sourceByName;
+    svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
+    guiSupport = getConfig ["git" "guiSupport"] false;
+    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
+  };
+
+  qgit = import ./qgit {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libXext libX11;
+    qt = qt3;
+  };
+
+  qgitGit = import ./qgit/qgit-git.nix {
+    inherit fetchurl stdenv;
+    inherit (xlibs) libXext libX11;
+    inherit (bleedingEdgeRepos) sourceByName;
+    qt = qt4;
+  };
+
+
+  stgit = import ./stgit {
+        inherit fetchurl stdenv python git;
+  };
+
+  topGit = stdenv.mkDerivation {
+      name = "TopGit-git-patched";
+      src = sourceByName "topGit"; # destination directory is patched
+      installPhase = ''
+        mkdir -p $out/etc/bash_completion.d
+        make install
+        mv contrib/tg-completion.bash $out/etc/bash_completion.d
+      '';
+      dontPatchELF = 1;
+      meta = {
+        description = "TopGit aims to make handling of large amount of interdependent topic branches easier";
+        homepage = http://repo.or.cz/w/topgit.git; # maybe there is also another one, I haven't checked
+        license = "GPLv2";
+    };
+  };
+
+  hg2git = import ./hg2git {
+    inherit fetchurl stdenv mercurial coreutils git makeWrapper;
+    inherit (bleedingEdgeRepos) sourceByName;
+  };
+
+}
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index 7824eaf69735..7824eaf69735 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
new file mode 100644
index 000000000000..25a76ea3dd23
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi-2.patch
@@ -0,0 +1,28 @@
+
+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
+@@ -84,7 +84,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)
+@@ -96,10 +96,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
diff --git a/pkgs/applications/version-management/git/docbook2texi.patch b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
index b2a6fbcaec5f..b2a6fbcaec5f 100644
--- a/pkgs/applications/version-management/git/docbook2texi.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/docbook2texi.patch
diff --git a/pkgs/applications/version-management/git/git-git.nix b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
index cb885280b5a3..a711f399a82f 100644
--- a/pkgs/applications/version-management/git/git-git.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/git-git.nix
@@ -14,11 +14,16 @@ assert svnSupport -> (subversion != null && perlLibs != [] && subversion.perlBin
 assert svnSupport -> subversion.perlBindings;
 
 stdenv.mkDerivation rec {
+  # the glob patch adds the filter [touching paths (glob)] to gitk
+  # contact marco-oweber@gmx.de if you want to know more details
   name = "git-git-with-glob-patch";
 
   src = sourceByName "git";
 
-  patches = [  ./glob-path.patch ./docbook2texi.patch ];
+  patchePhase = ''
+    patch -p1 < ${./docbook2texi-2.patch}
+    sed -i 's/docbook2x-texi/docbook2texi/gc' Documentation/Makefile
+  '';
   # maybe this introduces unneccessary dependencies ?
   patchPhase = "
     unset patchPhase; patchPhase;
diff --git a/pkgs/applications/version-management/git/glob-path.patch b/pkgs/applications/version-management/git-and-tools/git/glob-path.patch
index 7515ade57875..7515ade57875 100644
--- a/pkgs/applications/version-management/git/glob-path.patch
+++ b/pkgs/applications/version-management/git-and-tools/git/glob-path.patch
diff --git a/pkgs/tools/misc/hg2git/default.nix b/pkgs/applications/version-management/git-and-tools/hg2git/default.nix
index 291391b67191..291391b67191 100644
--- a/pkgs/tools/misc/hg2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/hg2git/default.nix
diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
index e84f447f505f..e84f447f505f 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/qgit/default.nix
diff --git a/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
new file mode 100644
index 000000000000..b794b34052cb
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/qgit/qgit-git.nix
@@ -0,0 +1,17 @@
+{stdenv, fetchurl, qt, libXext, libX11, sourceByName}:
+
+stdenv.mkDerivation rec {
+  name = "qgit-git";
+  meta =
+  {
+    license = "GPLv2";
+    homepage = "http://digilander.libero.it/mcostalba/";
+    description = "Graphical front-end to Git";
+  };
+  src = sourceByName "qgit";
+  buildInputs = [qt libXext libX11];
+  buildPhase = ''
+    qmake PREFIX=$out
+    make
+  '';
+}
diff --git a/pkgs/applications/version-management/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
index f31e6ec16b03..f31e6ec16b03 100644
--- a/pkgs/applications/version-management/stgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix
diff --git a/pkgs/misc/bleeding-edge-fetch-infos.nix b/pkgs/misc/bleeding-edge-fetch-infos.nix
index 3ab6bcd44f56..e398fd08b7f5 100644
--- a/pkgs/misc/bleeding-edge-fetch-infos.nix
+++ b/pkgs/misc/bleeding-edge-fetch-infos.nix
@@ -15,9 +15,9 @@
     url = http://mawercer.de/~nix/repos/ghc_lambdavm.tar.gz;
     sha256 = "3d10e839b8226987383e870258ff38b56442ff254688f7c50983850676f992cb";
   };
-  git = args: with args; fetchurl {
-    url = http://mawercer.de/~nix/repos/git.tar.gz;
-    sha256 = "1f0df3da8d6c9425ab80bd9c623570b7a35e5a622fbf56b903e1bf82a01d4e5f";
+  git = args: with args; fetchurl { # Tue Jan 20 22:28:04 UTC 2009
+    url = "http://mawercer.de/~nix/repos/git-a227bce65f3fcdfbf28f109809b7e2e518b906f8.tar.gz";
+    sha256 = "7420a385718c7edec956fb0cba1a8a11d4b45edc833d7c06bf7c4764188ce180";
   };
   happs_data = args: with args; fetchurl {
     url = http://mawercer.de/~nix/repos/happs_data.tar.gz;
@@ -219,9 +219,9 @@
     url = "http://mawercer.de/~nix/repos/cinelerra-9f9adf2ad5472886d5bc43a05c6aa8077cabd967.tar.gz";
     sha256 = "1e84ff59dcd7a3c80343eb9be302f822e510c95398fd1a6c8f2e4b163fd51e45";
   };
-  hg2git = args: with args; fetchurl { # Sat Oct 18 21:02:44 UTC 2008
-    url = "http://mawercer.de/~nix/repos/hg2git-4c77e121b739d2aac8a23352503763343823f870.tar.gz";
-    sha256 = "22354d36937bf9e5d3e3dfc1a3ef9e3f2bc183b8e114a23958a2b10f83abc97e";
+  hg2git = args: with args; fetchurl { # Tue Jan 20 22:49:27 UTC 2009
+    url = "http://mawercer.de/~nix/repos/hg2git-0fabb998a19c850cb8fcfcf72414b18070d94378.tar.gz";
+    sha256 = "ce7cd089681e6eee24f5bc9ab3b73f1e49d368b83a32d00695eadca00533ac5d";
   };
  octave = args: with args; fetchurl { # Mon Dec  1 23:23:49 UTC 2008
    url = "http://mawercer.de/~nix/repos/octave-03b414516dd8.tar.gz";
@@ -231,4 +231,12 @@
     url = "http://mawercer.de/~nix/repos/zsh-2008-12-21_12-50-23.tar.gz";
     sha256 = "9af16f89205759d7ade51268dbdfa02cec3db10b35dc7a56ffe8e1fde2074ae7";
   };
+  topGit = args: with args; fetchurl { # Tue Jan 20 21:29:50 UTC 2009
+    url = "http://mawercer.de/~nix/repos/topGit-5b823563a678fe46ddf768977ab9d00525945ec6.tar.gz";
+    sha256 = "e027311b2b058bab05a7175546854d61325bba591109e68c59209edc6939e5cb";
+  };
+  qgit = args: with args; fetchurl { # Tue Jan 20 21:35:00 UTC 2009
+    url = "http://mawercer.de/~nix/repos/qgit-b5dd5fd691e9423124cf356abe26e641bc33d159.tar.gz";
+    sha256 = "e04de308feb40716a6b02d1f69dc834f4fa859865b64e8f91beb6018fa953f96";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 05326730d7c7..b07f2e16ab78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -867,11 +867,6 @@ let
     inherit fetchurl stdenv ocaml;
   };
 
-  hg2git = import ../tools/misc/hg2git {
-    inherit fetchurl stdenv mercurial coreutils git makeWrapper;
-    inherit (bleedingEdgeRepos) sourceByName;
-  };
-
   highlight = builderDefsPackage (selectVersion ../tools/text/highlight "2.6.10") {
     inherit getopt;
   };
@@ -7440,32 +7435,10 @@ let
     inherit (gnome) gtk libgtkhtml libart_lgpl;
   };
 
-  git = import ../applications/version-management/git {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext
-      asciidoc texinfo xmlto docbook2x
-      docbook_xsl docbook_xml_dtd_42 libxslt
-      cpio tcl tk makeWrapper subversion;
-    svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
-    guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
-  };
-
-  gitGit = import ../applications/version-management/git/git-git.nix {
-    inherit fetchurl stdenv curl openssl zlib expat perl gettext
-      asciidoc texinfo xmlto docbook2x
-      docbook_xsl docbook_xml_dtd_42 libxslt
-      cpio tcl tk makeWrapper subversion autoconf;
-    inherit (bleedingEdgeRepos) sourceByName;
-    svnSupport = getConfig ["git" "svnSupport"] false; # for git-svn support
-    guiSupport = getConfig ["git" "guiSupport"] false;
-    perlLibs = [perlLWP perlURI perlTermReadKey subversion];
-  };
-
-  qgit = import ../applications/version-management/qgit {
-    inherit fetchurl stdenv;
-    inherit (xlibs) libXext libX11;
-    qt = qt3;
-  };
+  gitAndTools = recurseIntoAttrs (import ../applications/version-management/git-and-tools {
+    inherit pkgs;
+  });
+  git = gitAndTools.git;
 
   qjackctl = import ../applications/audio/qjackctl {
     inherit fetchurl stdenv alsaLib jackaudio;
@@ -7964,10 +7937,6 @@ let
   };
 
 
-  stgit = import ../applications/version-management/stgit {
-    inherit fetchurl stdenv python git;
-  };
-
   stumpwm = builderDefsPackage (import ../applications/window-managers/stumpwm) {
     inherit clisp texinfo;
   };