bzrTools: update from 2.5 to 2.6 and refactor

This commit is contained in:
Pascal Wittmann 2015-05-03 00:02:04 +02:00
parent 2514f80bdf
commit 9dcac56f34
2 changed files with 12 additions and 12 deletions

View File

@ -1,20 +1,22 @@
args : with args; { stdenv, fetchurl, makeWrapper, python2, bazaar }:
stdenv.mkDerivation rec {
name = "bzr-tools-${version}";
version = "2.6.0";
rec {
version = "2.5";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz";
sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb";
}; };
buildInputs = []; buildInputs = [ makeWrapper python2 ];
configureFlags = [];
/* doConfigure should be specified separately */ installPhase = ''
phaseNames = [(simplyShare "bzrtools")]; ${python2}/bin/python ./setup.py install --prefix=$out
'';
name = "bzr-tools-${version}";
meta = { meta = {
description = "Bazaar plugins"; description = "Bazaar plugins";
homepage = http://wiki.bazaar.canonical.com/BzrTools;
}; };
} }

View File

@ -10243,9 +10243,7 @@ let
bazaar = callPackage ../applications/version-management/bazaar { }; bazaar = callPackage ../applications/version-management/bazaar { };
bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { };
inherit bazaar;
};
beast = callPackage ../applications/audio/beast { beast = callPackage ../applications/audio/beast {
inherit (gnome) libgnomecanvas libart_lgpl; inherit (gnome) libgnomecanvas libart_lgpl;