summary refs log tree commit diff
path: root/pkgs/development/interpreters
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2021-03-24 12:12:48 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2021-04-03 17:49:42 +0200
commit4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd (patch)
treecc7c16b5055c488033a02038c4404006c088ff6f /pkgs/development/interpreters
parent3955326221aaae03621ad5836941fc6eb78e09ed (diff)
downloadnixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar.gz
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar.bz2
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar.lz
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar.xz
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.tar.zst
nixpkgs-4f02e12f8a7e869234d5e98b15aa4a5a08e7a7dd.zip
python2Packages: separate extension
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r--pkgs/development/interpreters/python/default.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index dcccaf1f2b7..07d52a532fb 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -69,12 +69,15 @@ with pkgs;
               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
           pkgs.splicePackages
           pkgs.newScope
           otherSplices
           keep
-          (lib.extends overrides pythonPackagesFun))
+          (lib.extends extensions pythonPackagesFun))
         {
           overrides = packageOverrides;
         };