Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pythonPackages: Switch to lib.makeScope for overrideScope support #67422

Closed
wants to merge 1 commit into from
Closed

pythonPackages: Switch to lib.makeScope for overrideScope support #67422

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@

with pkgs.lib;

let
packages = ( self:
(makeScope pkgs.newScope ( self:

let
inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy3k isPyPy pythonAtLeast pythonOlder;

callPackage = pkgs.newScope self;
callPackage = self.callPackage;

namePrefix = python.libPrefix + "-";

Expand Down Expand Up @@ -105,7 +104,7 @@ in {

inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy3k isPyPy pythonAtLeast pythonOlder;
inherit python bootstrapped-pip buildPythonPackage buildPythonApplication;
inherit fetchPypi callPackage;
inherit fetchPypi;
inherit hasPythonModule requiredPythonModules makePythonPath disabledIf;
inherit toPythonModule toPythonApplication;
inherit buildSetupcfg;
Expand Down Expand Up @@ -6194,6 +6193,4 @@ in {
runway-python = callPackage ../development/python-modules/runway-python { };

pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { };
});

in fix' (extends overrides packages)
})).overrideScope' overrides