From 5436356733147985a1c5cfff809a13ba217dea98 Mon Sep 17 00:00:00 2001
From: Florian Friesdorf <flo@chaoflow.net>
Date: Mon, 3 Dec 2012 04:40:38 +0100
Subject: [PATCH] a package does not need to include setuptools manually

this breaks for now
---
 pkgs/applications/misc/calibre/default.nix                    | 2 +-
 .../networking/instant-messengers/salut-a-toi/default.nix     | 2 +-
 pkgs/applications/version-management/mercurial/default.nix    | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index a2e29ffba03..b9b14848370 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
       fontconfig podofo qt4 pil chmlib icu
       pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
       pythonPackages.cssutils pythonPackages.beautifulsoup
-      pythonPackages.setuptools pythonPackages.sqlite3 sqlite
+      pythonPackages.sqlite3 sqlite
     ];
 
   installPhase = ''
diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
index 98a3ac55fad..c35101bb874 100644
--- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   buildInputs = with pythonPackages; 
     [
       python twisted urwid beautifulsoup wxPython distribute pygobject
-      wokkel pythonDBus pyfeed pythonPackages.setuptools wrapPython
+      wokkel pythonDBus pyfeed wrapPython
     ];
 
   configurePhase = ''
diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index afbfc1c8935..6a06cd545c3 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, makeWrapper, docutils, setuptools, unzip
+{ stdenv, fetchurl, python, makeWrapper, docutils, unzip
 , guiSupport ? false, tk ? null, curses }:
 
 let
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   inherit python; # pass it so that the same version can be used in hg2git
   pythonPackages = [ curses ];
 
-  buildInputs = [ python makeWrapper docutils setuptools unzip ];
+  buildInputs = [ python makeWrapper docutils unzip ];
 
   makeFlags = "PREFIX=$(out)";