From 7b7dd238fcc3a08fc08e4b1af332dbc03452bc14 Mon Sep 17 00:00:00 2001
From: Nicolas Pierron <nicolas.b.pierron@gmail.com>
Date: Sun, 15 Apr 2012 23:48:11 +0000
Subject: [PATCH] Add dulwich (git filesystem in python). Add bugz (command
 line tool for bugzilla) Add gitBz (bugzilla in git)

svn path=/nixpkgs/trunk/; revision=33800
---
 .../git-and-tools/default.nix                 |  7 +++
 pkgs/development/tools/misc/gdb/default.nix   |  2 -
 pkgs/top-level/python-packages.nix            | 56 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 4a0c16b9343c..034d0254c633 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -23,6 +23,13 @@ rec {
     ];
   };
 
+  # support for bugzilla
+  gitBz = import ./git-bz {
+    inherit fetchgit stdenv makeWrapper python asciidoc xmlto # docbook2x docbook_xsl docbook_xml_dtd_45 libxslt
+      ;
+    inherit (pythonPackages) pysqlite;
+  };
+
   # Git with SVN support, but without GUI.
   gitSVN = lowPrio (appendToName "with-svn" (git.override {
     svnSupport = true;
diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index e9c424ccf11a..a1be30b4b141 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -75,8 +75,6 @@ stdenv.mkDerivation rec {
        rm -v $out/share/info/{standards,configure,bfd}.info
     '';
 
-  enableParallelBuilding = true;
-
   # TODO: Investigate & fix the test failures.
   doCheck = false;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f49e6dce5718..002fc8daff10 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4,7 +4,7 @@ let pythonPackages = python.modules // rec {
 
   inherit python;
 
-  inherit (pkgs) fetchurl fetchsvn stdenv;
+  inherit (pkgs) fetchurl fetchsvn fetchgit stdenv;
 
 
   buildPythonPackage = import ../development/python-modules/generic {
@@ -201,6 +201,25 @@ let pythonPackages = python.modules // rec {
   };
 
 
+  bugz = buildPythonPackage (rec {
+    name = "bugz-0.9.3";
+
+    src = fetchgit {
+      url = "git://github.com/williamh/pybugz.git";
+      rev = "refs/tags/0.9.3";
+    };
+
+    propagatedBuildInputs = [ argparse python.modules.ssl ];
+
+    doCheck = false;
+
+    meta = {
+      homepage = http://www.liquidx.net/pybugz/;
+      description = "Command line interface for Bugzilla";
+    };
+  });
+
+
   carrot = buildPythonPackage rec {
     name = "carrot-0.10.7";
 
@@ -368,6 +387,41 @@ let pythonPackages = python.modules // rec {
     };
   };
 
+  dulwich = buildPythonPackage rec {
+    name = "dulwich-0.8.1";
+
+    src = fetchurl {
+      url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz";
+      sha256 = "1a1619e9c7e63fe9bdc93356ee893be1016b7ea12ad953f4e1f1f5c0c5056ee8";
+    };
+
+    buildPhase = "make build";
+    installCommand = ''
+      python setup.py install --prefix="$out" --root=/ --record="$out/lib/${python.libPrefix}/site-packages/dulwich/list.txt" --single-version-externally-managed
+    '';
+    doCheck = false;
+
+    meta = {
+      description = "Simple Python implementation of the Git file formats and protocols.";
+      homepage = http://samba.org/~jelmer/dulwich/;
+    };
+  };
+
+  hggit = buildPythonPackage rec {
+    name = "hg-git-0.3.1";
+
+    src = fetchurl {
+      url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
+      md5 = "4b15867a07abb0be985177581ce64cee";
+    };
+
+    propagatedBuildInputs = [ dulwich ];
+
+    meta = {
+      description = "Push and pull from a Git server using Mercurial.";
+      homepage = http://hg-git.github.com/;
+    };
+  };
 
   docutils = buildPythonPackage rec {
     name = "docutils-0.8.1";