public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Bazaar: update to 2.3.1.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26573
This commit is contained in:
Eelco Dolstra 2011-03-28 15:47:50 +00:00
parent 120d1757fe
commit 641834ddf6
4 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/version-management/bazaar/default.nix
View File

@ -1,30 +1,24 @@
{stdenv, fetchurl, python, makeWrapper}: { stdenv, fetchurl, python, pythonPackages, makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "2.2"; version = "2.3";
release = ".0"; release = ".1";
name = "bazaar-${version}${release}"; name = "bazaar-${version}${release}";
src = fetchurl { src = fetchurl {
url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz"; url = "http://launchpad.net/bzr/${version}/${version}${release}/+download/bzr-${version}${release}.tar.gz";
sha256 = "64cd6c23097884e40686adc7f0ad4a8200e2292bdc5e0caba3563b6f5c32bacf"; sha256 = "07kx41w4gqv68bcykdflsg68wvpmcyqknzyb4vr1zqlf27hahp53";
}; };
buildInputs = [python makeWrapper]; buildInputs = [ python makeWrapper ];
installPhase = '' installPhase = ''
python setup.py install --prefix=$out python setup.py install --prefix=$out
wrapProgram $out/bin/bzr --prefix PYTHONPATH : "$(toPythonPath $out)" wrapProgram $out/bin/bzr --prefix PYTHONPATH : "$(toPythonPath $out ${pythonPackages.ssl})"
''; '';
passthru = {
# If someone wants to assert python features..
inherit python;
};
meta = { meta = {
homepage = http://bazaar-vcs.org/; homepage = http://bazaar-vcs.org/;
description = "A distributed version control system that Just Works"; description = "A distributed version control system that Just Works";
}; };
} }

2
pkgs/tools/networking/getmail/default.nix
View File

@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn"; sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
}; };
propagatedBuildInputs = [ pythonPackages.ssl ]; pythonPath = [ pythonPackages.ssl ];
doCheck = false; doCheck = false;

4
pkgs/top-level/all-packages.nix
View File

@ -5534,9 +5534,7 @@ let
batik = callPackage ../applications/graphics/batik { }; batik = callPackage ../applications/graphics/batik { };
bazaar = callPackage ../applications/version-management/bazaar { bazaar = callPackage ../applications/version-management/bazaar { };
python = pythonFull;
};
bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) { bazaarTools = builderDefsPackage (import ../applications/version-management/bazaar/tools.nix) {
inherit bazaar; inherit bazaar;

2
pkgs/top-level/python-packages.nix
View File

@ -582,6 +582,8 @@ python.modules // rec {
sha256 = "1hl3lbwdfl2a64q3dxc73kbiks4iwx5cixlbavyryd8xdr7iziww"; sha256 = "1hl3lbwdfl2a64q3dxc73kbiks4iwx5cixlbavyryd8xdr7iziww";
}; };
doCheck = false; # see http://code.google.com/p/python-nose/issues/detail?id=340
meta = { meta = {
description = "A unittest-based testing framework for python that makes writing and running tests easier"; description = "A unittest-based testing framework for python that makes writing and running tests easier";
}; };