public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgs/top-level/all-packages.nix: obsoleted setuptools_python26 and setuptools_python27

Browse Source 
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
This commit is contained in:
Peter Simons
2010-08-12 14:01:51 +00:00
parent a30807b8fd
commit 04ee1d78ad
1 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkgs/top-level/all-packages.nix
View File

@@ -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 {