lol

bzrTools: update from 2.5 to 2.6 and refactor

+12 -12
+11 -9
pkgs/applications/version-management/bazaar/tools.nix
··· 1 - args : with args; 1 + { stdenv, fetchurl, makeWrapper, python2, bazaar }: 2 2 3 - rec { 4 - version = "2.5"; 3 + stdenv.mkDerivation rec { 4 + name = "bzr-tools-${version}"; 5 + version = "2.6.0"; 6 + 5 7 src = fetchurl { 6 8 url = "http://launchpad.net/bzrtools/stable/${version}/+download/bzrtools-${version}.tar.gz"; 7 - sha256 = "0gzh63vl9006cpklszwmsymrq5ddxxrnxwbv5bwi740jlvxzdkxw"; 9 + sha256 = "0n3zzc6jf5866kfhmrnya1vdr2ja137a45qrzsz8vz6sc6xgn5wb"; 8 10 }; 9 11 10 - buildInputs = []; 11 - configureFlags = []; 12 + buildInputs = [ makeWrapper python2 ]; 12 13 13 - /* doConfigure should be specified separately */ 14 - phaseNames = [(simplyShare "bzrtools")]; 14 + installPhase = '' 15 + ${python2}/bin/python ./setup.py install --prefix=$out 16 + ''; 15 17 16 - name = "bzr-tools-${version}"; 17 18 meta = { 18 19 description = "Bazaar plugins"; 20 + homepage = http://wiki.bazaar.canonical.com/BzrTools; 19 21 }; 20 22 }
+1 -3
pkgs/top-level/all-packages.nix
··· 10243 10243 10244 10244 bazaar = callPackage ../applications/version-management/bazaar { }; 10245 10245 10246 - bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { 10247 - inherit bazaar; 10248 - }; 10246 + bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; 10249 10247 10250 10248 beast = callPackage ../applications/audio/beast { 10251 10249 inherit (gnome) libgnomecanvas libart_lgpl;