diff options
| author | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 15:03:54 +0200 |
|---|---|---|
| committer | Malte Brandy <malte.brandy@maralorn.de> | 2021-05-07 15:03:54 +0200 |
| commit | 2a11f1f5cc1c4680b49240203db18ecbb19b9cc5 (patch) | |
| tree | df44c5fcd797c97297ab663b63167e9b4bc06a72 /pkgs/development/interpreters/python/default.nix | |
| parent | f73c2278d07e674233040422b71d965a0587756f (diff) | |
| parent | ae1c8ede09b53007ba9b3c32f926c9c03547ae8b (diff) | |
| download | nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.gz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.bz2 nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.lz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.xz nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.tar.zst nixpkgs-2a11f1f5cc1c4680b49240203db18ecbb19b9cc5.zip | |
Merge branch 'master' into haskell-updates
Diffstat (limited to 'pkgs/development/interpreters/python/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index d74e017d830..5f13418aa58 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -69,6 +69,7 @@ with pkgs; recursivePthLoader ; }; + extra = _: {}; optionalExtensions = cond: as: if cond then as else []; python2Extension = import ../../../top-level/python2-packages.nix; extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ [ overrides ]); @@ -77,6 +78,7 @@ with pkgs; pkgs.newScope otherSplices keep + extra (lib.extends extensions pythonPackagesFun)) { overrides = packageOverrides; |