Added bazaar tools (not installed globally, just copied to share, you have to symlink them to your ~/.bazaar/plugins). Also readline support for python.

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

2 files changed, 28 insertions, 0 deletions

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index c21b38d55232..c2b5306b2e2a 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -15,6 +15,11 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/bzr --prefix PYTHONPATH : "$(toPythonPath $out)"
   '';
 
+  passthru = {
+    # If someone wants to assert python features..
+    inherit python;
+  };
+
   meta = {
     homepage = http://bazaar-vcs.org/;
     description = "A distributed version control system that Just Works";
diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
new file mode 100644
index 000000000000..c36ac2d63dc3
--- /dev/null
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -0,0 +1,23 @@
+args : with args; 
+
+if ! bazaar.python.readlineSupport then 
+  throw "Bazaar Tools require readline support in python."
+else
+
+rec {
+  src = fetchurl {
+    url = http://launchpad.net/bzrtools/stable/1.5.0/+download/bzrtools-1.5.0.tar.gz;
+    sha256 = "0lm4qhsjy3k8zp9hcahlf37v69w6lhhz2x3hjskgm3rk6b0bngjz";
+  };
+
+  buildInputs = [];
+  configureFlags = [];
+
+  /* doConfigure should be specified separately */
+  phaseNames = [(simplyShare "bzrtools")];
+      
+  name = "bzr-tools-1.5";
+  meta = {
+    description = "Bazaar plugins.";
+  };
+}