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

python and pythonPackage attr naming - cosmetic changes

Browse Source
This commit is contained in:
Florian Friesdorf 2014-07-07 18:55:43 +02:00
parent 7dde165353
commit 168bfea867
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3562,17 +3562,26 @@ let
llvm = llvm_33 ; llvm = llvm_33 ;
}; };
python = python2;
python2 = python27;
python3 = python34;
# pythonPackages further below, but assigned here because they need to be in sync
pythonPackages = python2Packages;
python2Packages = python27Packages;
python3Packages = python34Packages;
pythonFull = python2Full;
python2Full = python27Full;
python26 = callPackage ../development/interpreters/python/2.6 { db = db47; }; python26 = callPackage ../development/interpreters/python/2.6 { db = db47; };
python27 = callPackage ../development/interpreters/python/2.7 { }; python27 = callPackage ../development/interpreters/python/2.7 { };
python32 = callPackage ../development/interpreters/python/3.2 { }; python32 = callPackage ../development/interpreters/python/3.2 { };
python33 = callPackage ../development/interpreters/python/3.3 { }; python33 = callPackage ../development/interpreters/python/3.3 { };
python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { }); python34 = hiPrio (callPackage ../development/interpreters/python/3.4 { });
python = python27;
python3 = python3Packages.python;
pypy = callPackage ../development/interpreters/pypy/2.3 { }; pypy = callPackage ../development/interpreters/pypy/2.3 { };
pythonFull = python27Full;
python26Full = callPackage ../development/interpreters/python/wrapper.nix { python26Full = callPackage ../development/interpreters/python/wrapper.nix {
extraLibs = []; extraLibs = [];
postBuild = ""; postBuild = "";
@ -6527,8 +6536,6 @@ let
# python function with default python interpreter # python function with default python interpreter
buildPythonPackage = pythonPackages.buildPythonPackage; buildPythonPackage = pythonPackages.buildPythonPackage;
pythonPackages = python27Packages;
# `nix-env -i python-nose` installs for 2.7, the default python. # `nix-env -i python-nose` installs for 2.7, the default python.
# Therefore we do not recurse into attributes here, in contrast to # Therefore we do not recurse into attributes here, in contrast to
# python27Packages. `nix-env -iA python26Packages.nose` works # python27Packages. `nix-env -iA python26Packages.nose` works
@ -6538,7 +6545,15 @@ let
python = python26; python = python26;
}; };
python3Packages = python34Packages; python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python = python27;
}));
python32Packages = import ./python-packages.nix {
inherit pkgs;
python = python32;
};
python33Packages = recurseIntoAttrs (import ./python-packages.nix { python33Packages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs; inherit pkgs;
@ -6550,16 +6565,6 @@ let
python = python34; python = python34;
}); });
python32Packages = import ./python-packages.nix {
inherit pkgs;
python = python32;
};
python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python = python27;
}));
pypyPackages = recurseIntoAttrs (import ./python-packages.nix { pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs; inherit pkgs;
python = pypy; python = pypy;