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

Jump to bottom

pythonInterpreters: don't use with pkgs #196052

Merged
merged 2 commits into from
Oct 15, 2022
Merged

pythonInterpreters: don't use with pkgs #196052

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e82c1ce
pythonInterpreters: don't use with pkgs
Artturin Oct 15, 2022
a45996a
pythonInterpreters: get self from __splicedPackages
Artturin Oct 15, 2022
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
53 changes: 31 additions & 22 deletions pkgs/development/interpreters/python/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
{ pkgs }:

with pkgs;
{ __splicedPackages
, callPackage
, config
, darwin
, db
, lib
, libffiBoot
, newScope
, pythonPackagesExtensions
, splicePackages
, stdenv
}:

(let

Expand Down Expand Up @@ -79,11 +88,11 @@ with pkgs;
extra = _: {};
optionalExtensions = cond: as: if cond then as else [];
python2Extension = import ../../../top-level/python2-packages.nix;
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pkgs.pythonPackagesExtensions ++ [ overrides ]);
extensions = lib.composeManyExtensions ((optionalExtensions (!self.isPy3k) [python2Extension]) ++ pythonPackagesExtensions ++ [ overrides ]);
aliases = self: super: lib.optionalAttrs config.allowAliases (import ../../../top-level/python-aliases.nix lib self super);
in lib.makeScopeWithSplicing
pkgs.splicePackages
pkgs.newScope
splicePackages
newScope
otherSplices
keep
extra
Expand Down Expand Up @@ -150,7 +159,7 @@ with pkgs;
in {

python27 = callPackage ./cpython/2.7 {
self = python27;
self = __splicedPackages.python27;
sourceVersion = {
major = "2";
minor = "7";
Expand All @@ -163,7 +172,7 @@ in {
};

python37 = callPackage ./cpython {
self = python37;
self = __splicedPackages.python37;
sourceVersion = {
major = "3";
minor = "7";
Expand All @@ -176,7 +185,7 @@ in {
};

python38 = callPackage ./cpython {
self = python38;
self = __splicedPackages.python38;
sourceVersion = {
major = "3";
minor = "8";
Expand All @@ -189,19 +198,19 @@ in {
};

python39 = callPackage ./cpython ({
self = python39;
self = __splicedPackages.python39;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python39);

python310 = callPackage ./cpython ({
self = python310;
self = __splicedPackages.python310;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python310);

python311 = callPackage ./cpython {
self = python311;
self = __splicedPackages.python311;
sourceVersion = {
major = "3";
minor = "11";
Expand All @@ -215,7 +224,7 @@ in {

# Minimal versions of Python (built without optional dependencies)
python3Minimal = (callPackage ./cpython ({
self = python3Minimal;
self = __splicedPackages.python3Minimal;
inherit passthruFun;
pythonAttr = "python3Minimal";
# strip down that python version as much as possible
Expand All @@ -226,7 +235,7 @@ in {
sqlite = null;
configd = null;
tzdata = null;
libffi = pkgs.libffiBoot; # without test suite
libffi = libffiBoot; # without test suite
stripConfig = true;
stripIdlelib = true;
stripTests = true;
Expand All @@ -244,7 +253,7 @@ in {
});

pypy27 = callPackage ./pypy {
self = pypy27;
self = __splicedPackages.pypy27;
sourceVersion = {
major = "7";
minor = "3";
Expand All @@ -253,14 +262,14 @@ in {
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
python = __splicedPackages.python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};

pypy38 = callPackage ./pypy {
self = pypy38;
self = __splicedPackages.pypy38;
sourceVersion = {
major = "7";
minor = "3";
Expand All @@ -269,20 +278,20 @@ in {
sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY=";
pythonVersion = "3.8";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
python = __splicedPackages.python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy37 = pypy38.override {
self = pythonInterpreters.pypy37;
pypy37 = __splicedPackages.pypy38.override {
self = __splicedPackages.pythonInterpreters.pypy37;
pythonVersion = "3.7";
sha256 = "sha256-LtAqyecQhZxBvILer7CGGXkruaJ+6qFnbHQe3t0hTdc=";
};

pypy27_prebuilt = callPackage ./pypy/prebuilt_2_7.nix {
# Not included at top-level
self = pythonInterpreters.pypy27_prebuilt;
self = __splicedPackages.pythonInterpreters.pypy27_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
Expand All @@ -295,7 +304,7 @@ in {

pypy38_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy38_prebuilt;
self = __splicedPackages.pythonInterpreters.pypy38_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
Expand Down