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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7026,34 +7026,34 @@ let
# 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
# regardless. # regardless.
python26Packages = import ./python-packages.nix { python26Packages = callPackage ./python-packages.nix {
inherit pkgs;
python = python26; python = python26;
self = python26Packages;
}; };
python27Packages = lib.hiPrioSet (recurseIntoAttrs (import ./python-packages.nix { python27Packages = lib.hiPrioSet (recurseIntoAttrs (callPackage ./python-packages.nix {
inherit pkgs;
python = python27; python = python27;
self = python27Packages;
})); }));
python32Packages = import ./python-packages.nix { python32Packages = callPackage ./python-packages.nix {
inherit pkgs;
python = python32; python = python32;
self = python32Packages;
}; };
python33Packages = recurseIntoAttrs (import ./python-packages.nix { python33Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
inherit pkgs;
python = python33; python = python33;
self = python33Packages;
}); });
python34Packages = recurseIntoAttrs (import ./python-packages.nix { python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
inherit pkgs;
python = python34; python = python34;
self = python34Packages;
}); });
pypyPackages = recurseIntoAttrs (import ./python-packages.nix { pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix {
inherit pkgs;
python = pypy; python = pypy;
self = pypyPackages;
}); });
foursuite = callPackage ../development/python-modules/4suite { }; foursuite = callPackage ../development/python-modules/4suite { };

2196
pkgs/top-level/python-packages.nix
View File

File diff suppressed because it is too large Load Diff