From 04ee1d78ad8ec2ec2454396e1dcebd5bafee01eb Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 12 Aug 2010 14:01:51 +0000
Subject: [PATCH] pkgs/top-level/all-packages.nix: obsoleted
 setuptools_python26 and setuptools_python27

Instead of having different setuptools expressions, buildPythonPackage
uses override to choose the desired python version. Now, technically,
buildPythonPackage shouldn't exist in multiple versions either. Maybe
the whole thing should be moved into python packages?

svn path=/nixpkgs/trunk/; revision=23151
---
 pkgs/top-level/all-packages.nix | 39 +++++++++++----------------------
 1 file changed, 13 insertions(+), 26 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddcd1a7358d7..2a806f0f2c1d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3934,24 +3934,21 @@ let
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  buildPythonPackage =
-    import ../development/python-modules/generic {
-      inherit python setuptools makeWrapper lib;
-    };
+  buildPythonPackage = import ../development/python-modules/generic {
+    inherit python setuptools makeWrapper lib;
+  };
 
-  buildPython26Package =
-    import ../development/python-modules/generic {
-      inherit makeWrapper lib;
-      python = python26;
-      setuptools = setuptools_python26;
-    };
+  buildPython26Package = import ../development/python-modules/generic {
+    inherit makeWrapper lib;
+    python = python26;
+    setuptools = setuptools.override { python = python26; };
+  };
 
-  buildPython27Package =
-    import ../development/python-modules/generic {
-      inherit makeWrapper lib;
-      python = python26;
-      setuptools = setuptools_python27;
-    };
+  buildPython27Package = import ../development/python-modules/generic {
+    inherit makeWrapper lib;
+    python = python27;
+    setuptools = setuptools.override { python = python27; };
+  };
 
   pythonPackages = python26Packages;
 
@@ -4022,16 +4019,6 @@ let
     inherit python makeWrapper;
   };
 
-  setuptools_python26 = builderDefsPackage (import ../development/python-modules/setuptools) {
-    inherit makeWrapper;
-    python = python26;
-  };
-
-  setuptools_python27 = builderDefsPackage (import ../development/python-modules/setuptools) {
-    inherit makeWrapper;
-    python = python27;
-  };
-
   wxPython = wxPython26;
 
   wxPython26 = callPackage ../development/python-modules/wxPython/2.6.nix {