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

python2Packages: separate extension

This commit is contained in:
Frederik Rietdijk 2021-03-24 12:12:48 +01:00
parent 3955326221
commit 4f02e12f8a
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/default.nix
View File

@ -69,12 +69,15 @@ with pkgs;
recursivePthLoader recursivePthLoader
; ;
}; };
optionalExtensions = cond: as: if cond then as else [];
python2Extension = import ../../../top-level/python2-packages.nix;
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]);
in lib.makeScopeWithSplicing in lib.makeScopeWithSplicing
pkgs.splicePackages pkgs.splicePackages
pkgs.newScope pkgs.newScope
otherSplices otherSplices
keep keep
(lib.extends overrides pythonPackagesFun)) (lib.extends extensions pythonPackagesFun))
{ {
overrides = packageOverrides; overrides = packageOverrides;
}; };

7
pkgs/top-level/python2-packages.nix Normal file
View File

@ -0,0 +1,7 @@
# Extension with Python 2 packages that is overlayed on top
# of the Python 3 packages set. This way, Python 2+3 compatible
# packages can still be used.
self: super: {
}