From 9dcac56f34f905a656db546ff06d9cdd5bbb41d5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 May 2015 00:02:04 +0200
Subject: [PATCH] bzrTools: update from 2.5 to 2.6 and refactor

---
 .../version-management/bazaar/tools.nix       | 20 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  4 +---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/version-management/bazaar/tools.nix b/pkgs/applications/version-management/bazaar/tools.nix
index f10fb5e65ce2..4e03371ff196 100644
--- a/pkgs/applications/version-management/bazaar/tools.nix
+++ b/pkgs/applications/version-management/bazaar/tools.nix
@@ -1,20 +1,22 @@
-args : with args; 
+{ stdenv, fetchurl, makeWrapper, python2, bazaar }:
 
-rec {
-  version = "2.5";
+stdenv.mkDerivation rec {
+  name = "bzr-tools-${version}";
+  version = "2.6.0";
+  
   src = fetchurl {
     url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
-    sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw";
+    sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
   };
 
-  buildInputs = [];
-  configureFlags = [];
+  buildInputs = [ makeWrapper python2 ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = [(simplyShare "bzrtools")];
+  installPhase = ''
+    ${python2}/bin/python ./setup.py install --prefix=$out
+  '';
       
-  name = "bzr-tools-${version}";
   meta = {
     description = "Bazaar plugins";
+    homepage = http://wiki.bazaar.canonical.com/BzrTools;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1afde965760c..05894be7f6c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10243,9 +10243,7 @@ let
 
   bazaar = callPackage ../applications/version-management/bazaar { };
 
-  bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
-    inherit bazaar;
-  };
+  bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { };
 
   beast = callPackage ../applications/audio/beast {
     inherit (gnome) libgnomecanvas libart_lgpl;