closes #463 pythonPackages now uses self variable instead of rec builtin

This commit is contained in:
Domen Kožar 2014-10-13 23:18:40 +02:00
parent f78f2a90d6
commit e17781f8b1
2 changed files with 1104 additions and 1116 deletions

View file

@ -7026,34 +7026,34 @@ let
# Therefore we do not recurse into attributes here, in contrast to
# python27Packages. `nix-env -iA python26Packages.nose` works
# regardless.
python26Packages = import ./python-packages.nix {
inherit pkgs;
python26Packages = callPackage ./python-packages.nix {
python = python26;
self = python26Packages;
};
python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix {
python = python27;
self = python27Packages;
}));
python32Packages = import ./python-packages.nix {
inherit pkgs;
python32Packages = callPackage ./python-packages.nix {
python = python32;
self = python32Packages;
};
python33Packages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python33Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
python = python33;
self = python33Packages;
});
python34Packages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
python = python34;
self = python34Packages;
});
pypyPackages = recurseIntoAttrs (import ./python-packages.nix {
inherit pkgs;
pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix {
python = pypy;
self = pypyPackages;
});
foursuite = callPackage ../development/python-modules/4suite { };

File diff suppressed because it is too large Load diff