movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

python3: Fixing excessive memory usage for overriden python in cross-compile (#394541)

Browse source
This commit is contained in:
Martin Weinelt 2025-04-04 23:26:37 +02:00 • committed by GitHub
commit 175fb278c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
pkgs/development/interpreters/python/cpython/default.nix
View file

@ -55,6 +55,7 @@
pkgsBuildTarget, pkgsBuildTarget,
pkgsHostHost, pkgsHostHost,
pkgsTargetTarget, pkgsTargetTarget,
__splices ? { },
# build customization # build customization
sourceVersion, sourceVersion,
@ -145,10 +146,28 @@ let
# When we override the interpreter we also need to override the spliced versions of the interpreter # When we override the interpreter we also need to override the spliced versions of the interpreter
# bluez is excluded manually to break an infinite recursion. # bluez is excluded manually to break an infinite recursion.
inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs; inputs' = lib.filterAttrs (n: v: n != "bluez" && n != "passthruFun" && !lib.isDerivation v) inputs;
# Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.
# python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming
# __splices as an arg and using the cache if populated.
splices = {
pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr};
pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr};
pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr};
pythonOnHostForHost = override pkgsHostHost.${pythonAttr};
pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) (
override pkgsTargetTarget.${pythonAttr}
);
} // __splices;
override = override =
attr: attr:
let let
python = attr.override (inputs' // { self = python; }); python = attr.override (
inputs'
// {
self = python;
__splices = splices;
}
);
in in
python; python;
in in
@ -160,13 +179,13 @@ let
pythonVersion = with sourceVersion; "${major}.${minor}"; pythonVersion = with sourceVersion; "${major}.${minor}";
sitePackages = "lib/${libPrefix}/site-packages"; sitePackages = "lib/${libPrefix}/site-packages";
inherit hasDistutilsCxxPatch pythonAttr; inherit hasDistutilsCxxPatch pythonAttr;
pythonOnBuildForBuild = override pkgsBuildBuild.${pythonAttr}; inherit (splices)
pythonOnBuildForHost = override pkgsBuildHost.${pythonAttr}; pythonOnBuildForBuild
pythonOnBuildForTarget = override pkgsBuildTarget.${pythonAttr}; pythonOnBuildForHost
pythonOnHostForHost = override pkgsHostHost.${pythonAttr}; pythonOnBuildForTarget
pythonOnTargetForTarget = lib.optionalAttrs (lib.hasAttr pythonAttr pkgsTargetTarget) ( pythonOnHostForHost
override pkgsTargetTarget.${pythonAttr} pythonOnTargetForTarget
); ;
}; };
version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";

6
pkgs/development/interpreters/python/passthrufun.nix
View file

@ -106,10 +106,6 @@ let
python = self; python = self;
} }
); );
pythonOnBuildForHost_overridden = pythonOnBuildForHost.override {
inherit packageOverrides;
self = pythonOnBuildForHost_overridden;
};
in in
rec { rec {
isPy27 = pythonVersion == "2.7"; isPy27 = pythonVersion == "2.7";
@ -144,7 +140,7 @@ rec {
pythonAtLeast = lib.versionAtLeast pythonVersion; pythonAtLeast = lib.versionAtLeast pythonVersion;
pythonOlder = lib.versionOlder pythonVersion; pythonOlder = lib.versionOlder pythonVersion;
inherit hasDistutilsCxxPatch; inherit hasDistutilsCxxPatch;
pythonOnBuildForHost = pythonOnBuildForHost_overridden; inherit pythonOnBuildForHost;
tests = callPackage ./tests.nix { tests = callPackage ./tests.nix {
python = self; python = self;