Python: move some attributes together with the rest of the Python-related attributes.
This commit is contained in:
parent
2d5a04e5bd
commit
a0aae85012
@ -6336,6 +6336,7 @@ with pkgs;
|
||||
python = python2;
|
||||
python2 = python27;
|
||||
python3 = python36;
|
||||
pypy = pypy27;
|
||||
|
||||
# Python interpreter that is build with all modules, including tkinter.
|
||||
# These are for compatibility and should not be used inside Nixpkgs.
|
||||
@ -6369,17 +6370,22 @@ with pkgs;
|
||||
self = python36;
|
||||
};
|
||||
|
||||
# Should eventually be moved inside Python interpreters.
|
||||
python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
|
||||
|
||||
pypy = pypy27;
|
||||
|
||||
pypy27 = callPackage ../development/interpreters/python/pypy/2.7 {
|
||||
self = pypy27;
|
||||
python = python27.override{x11Support=true;};
|
||||
db = db.override { dbmSupport = true; };
|
||||
};
|
||||
|
||||
# Python package sets.
|
||||
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
|
||||
python34Packages = python34.pkgs;
|
||||
python35Packages = python35.pkgs;
|
||||
python36Packages = recurseIntoAttrs python36.pkgs;
|
||||
pypyPackages = pypy.pkgs;
|
||||
|
||||
# Should eventually be moved inside Python interpreters.
|
||||
python-setup-hook = callPackage ../development/interpreters/python/setup-hook.nix { };
|
||||
|
||||
python2nix = callPackage ../tools/package-management/python2nix { };
|
||||
|
||||
pythonDocs = recurseIntoAttrs (callPackage ../development/interpreters/python/cpython/docs {});
|
||||
@ -10914,20 +10920,6 @@ with pkgs;
|
||||
sqitchModule = perlPackages.AppSqitch;
|
||||
};
|
||||
|
||||
### DEVELOPMENT / PYTHON MODULES
|
||||
|
||||
# Python package sets.
|
||||
|
||||
python27Packages = lib.hiPrioSet (recurseIntoAttrs python27.pkgs);
|
||||
|
||||
python34Packages = python34.pkgs;
|
||||
|
||||
python35Packages = python35.pkgs;
|
||||
|
||||
python36Packages = recurseIntoAttrs python36.pkgs;
|
||||
|
||||
pypyPackages = pypy.pkgs;
|
||||
|
||||
### DEVELOPMENT / R MODULES
|
||||
|
||||
R = callPackage ../applications/science/math/R {
|
||||
|
Loading…
Reference in New Issue
Block a user