Author: eelco
Date: Mon Mar 28 15:47:50 2011
New Revision: 26573
URL: https://svn.nixos.org/websvn/nix/?rev=26573&sc=1
Log:
* Bazaar: update to 2.3.1.
Modified:
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
nixpkgs/branches/modular-python/pkgs/tools/networking/getmail/default.nix
nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix
Modified:
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
==============================================================================
---
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
Mon Mar 28 15:46:10 2011 (r26572)
+++
nixpkgs/branches/modular-python/pkgs/applications/version-management/bazaar/default.nix
Mon Mar 28 15:47:50 2011 (r26573)
@@ -1,30 +1,24 @@
-{stdenv, fetchurl, python, makeWrapper}:
+{ stdenv, fetchurl, python, pythonPackages, makeWrapper }:
stdenv.mkDerivation rec {
- version = "2.2";
- release = ".0";
+ version = "2.3";
+ release = ".1";
name = "bazaar-${version}${release}";
src = fetchurl {
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 = ''
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 = {
homepage = http://bazaar-vcs.org/;
description = "A distributed version control system that Just Works";
};
-
}
Modified:
nixpkgs/branches/modular-python/pkgs/tools/networking/getmail/default.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/tools/networking/getmail/default.nix
Mon Mar 28 15:46:10 2011 (r26572)
+++ nixpkgs/branches/modular-python/pkgs/tools/networking/getmail/default.nix
Mon Mar 28 15:47:50 2011 (r26573)
@@ -9,7 +9,7 @@
sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
};
- propagatedBuildInputs = [ pythonPackages.ssl ];
+ pythonPath = [ pythonPackages.ssl ];
doCheck = false;
Modified: nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 15:46:10 2011 (r26572)
+++ nixpkgs/branches/modular-python/pkgs/top-level/all-packages.nix Mon Mar
28 15:47:50 2011 (r26573)
@@ -5534,9 +5534,7 @@
batik = callPackage ../applications/graphics/batik { };
- bazaar = callPackage ../applications/version-management/bazaar {
- python = pythonFull;
- };
+ bazaar = callPackage ../applications/version-management/bazaar { };
bazaarTools = builderDefsPackage (import
../applications/version-management/bazaar/tools.nix) {
inherit bazaar;
Modified: nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix
==============================================================================
--- nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix Mon Mar
28 15:46:10 2011 (r26572)
+++ nixpkgs/branches/modular-python/pkgs/top-level/python-packages.nix Mon Mar
28 15:47:50 2011 (r26573)
@@ -582,6 +582,8 @@
sha256 = "1hl3lbwdfl2a64q3dxc73kbiks4iwx5cixlbavyryd8xdr7iziww";
};
+ doCheck = false; # see
http://code.google.com/p/python-nose/issues/detail?id=340
+
meta = {
description = "A unittest-based testing framework for python that makes
writing and running tests easier";
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
