From 641834ddf6aa2e3876378f04ee4f47c3b2153542 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 28 Mar 2011 15:47:50 +0000
Subject: * Bazaar: update to 2.3.1.

svn path=/nixpkgs/branches/modular-python/; revision=26573
---
 .../applications/version-management/bazaar/default.nix | 18 ++++++------------
 pkgs/tools/networking/getmail/default.nix              |  2 +-
 pkgs/top-level/all-packages.nix                        |  4 +---
 pkgs/top-level/python-packages.nix                     |  2 ++
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix
index 46a09ccf422..4509d4f9b6e 100644
--- a/pkgs/applications/version-management/bazaar/default.nix
+++ b/pkgs/applications/version-management/bazaar/default.nix
@@ -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";
   };
-
 }
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 77bc9a2b9df..23fe3ad3674 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -9,7 +9,7 @@ buildPythonPackage rec {
     sha256 = "17cpyra61virk1d223w8pdwhv2qzhbwdbnrr1ab1znf4cv9m3knn";
   };
 
-  propagatedBuildInputs = [ pythonPackages.ssl ];
+  pythonPath = [ pythonPackages.ssl ];
 
   doCheck = false;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19412ffa85e..9219da5db65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5534,9 +5534,7 @@ let
 
   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;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56059f86ac1..7101a51f82c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -582,6 +582,8 @@ python.modules // rec {
       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";
     };
-- 
cgit 1.4.1