dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

pythonInterpreters: don't use with pkgs

Browse Source
This commit is contained in:
Artturin 2022-10-15 04:46:04 +03:00 committed by Frederik Rietdijk
parent 9259c4b841
commit 19d04b5f47
1 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,15 @@
{ pkgs }:
with pkgs;
{ pkgs
, callPackage
, config
, darwin
, db
, lib
, libffiBoot
, newScope
, pythonPackagesExtensions
, splicePackages
, stdenv
}:
(let
@ -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
@ -150,7 +159,7 @@ with pkgs;
in {
python27 = callPackage ./cpython/2.7 {
self = python27;
self = pkgs.python27;
sourceVersion = {
major = "2";
minor = "7";
@ -163,7 +172,7 @@ in {
};
python37 = callPackage ./cpython {
self = python37;
self = pkgs.python37;
sourceVersion = {
major = "3";
minor = "7";
@ -176,7 +185,7 @@ in {
};
python38 = callPackage ./cpython {
self = python38;
self = pkgs.python38;
sourceVersion = {
major = "3";
minor = "8";
@ -189,19 +198,19 @@ in {
};
python39 = callPackage ./cpython ({
self = python39;
self = pkgs.python39;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python39);
python310 = callPackage ./cpython ({
self = python310;
self = pkgs.python310;
inherit (darwin) configd;
inherit passthruFun;
} // sources.python310);
python311 = callPackage ./cpython {
self = python311;
self = pkgs.python311;
sourceVersion = {
major = "3";
minor = "11";
@ -215,7 +224,7 @@ in {
# Minimal versions of Python (built without optional dependencies)
python3Minimal = (callPackage ./cpython ({
self = python3Minimal;
self = pkgs.python3Minimal;
inherit passthruFun;
pythonAttr = "python3Minimal";
# strip down that python version as much as possible
@ -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;
@ -244,7 +253,7 @@ in {
});
pypy27 = callPackage ./pypy {
self = pypy27;
self = pkgs.pypy27;
sourceVersion = {
major = "7";
minor = "3";
@ -253,14 +262,14 @@ in {
sha256 = "sha256-wERP2YcwWMHA2Z4TqTTpIoXLBZksmWi/Ujwyv5vsCp0=";
pythonVersion = "2.7";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
python = pkgs.python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy38 = callPackage ./pypy {
self = pypy38;
self = pkgs.pypy38;
sourceVersion = {
major = "7";
minor = "3";
@ -269,20 +278,20 @@ in {
sha256 = "sha256-Ia4zn09QFtbKcwAwXz47VUNzg1yzw5qQQf4w5oEcgMY=";
pythonVersion = "3.8";
db = db.override { dbmSupport = !stdenv.isDarwin; };
python = python27;
python = pkgs.python27;
inherit passthruFun;
inherit (darwin) libunwind;
inherit (darwin.apple_sdk.frameworks) Security;
};
pypy37 = pypy38.override {
self = pythonInterpreters.pypy37;
pypy37 = pkgs.pypy38.override {
self = pkgs.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 = pkgs.pythonInterpreters.pypy27_prebuilt;
sourceVersion = {
major = "7";
minor = "3";
@ -295,7 +304,7 @@ in {
pypy38_prebuilt = callPackage ./pypy/prebuilt.nix {
# Not included at top-level
self = pythonInterpreters.pypy38_prebuilt;
self = pkgs.pythonInterpreters.pypy38_prebuilt;
sourceVersion = {
major = "7";
minor = "3";