[Nix-commits] SVN commit: nix - r23151 - nixpkgs/trunk/pkgs/top-level

[Peter Simons]

Author: simons
Date: Thu Aug 12 14:01:51 2010
New Revision: 23151
URL: https://svn.nixos.org/websvn/nix/?rev=23151&sc=1

Log:
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?

Modified:
   nixpkgs/trunk/pkgs/top-level/all-packages.nix

Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix       Thu Aug 12 13:56:57 
2010        (r23150)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix       Thu Aug 12 14:01:51 
2010        (r23151)
@@ -3934,24 +3934,21 @@
 
   ### DEVELOPMENT / PYTHON MODULES
 
-  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;
-    };
-
-  buildPython27Package =
-    import ../development/python-modules/generic {
-      inherit makeWrapper lib;
-      python = python26;
-      setuptools = setuptools_python27;
-    };
+  buildPythonPackage = import ../development/python-modules/generic {
+    inherit python setuptools makeWrapper lib;
+  };
+
+  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 = python27;
+    setuptools = setuptools.override { python = python27; };
+  };
 
   pythonPackages = python26Packages;
 
@@ -4022,16 +4019,6 @@
     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 {
_______________________________________________
nix-commits mailing list
nix-comm...@cs.uu.nl
http://mail.cs.uu.nl/mailman/listinfo/nix-commits