git.iko.soy/typeable/nixpkgs
on master help sign in
Python: rename parameters and arguments passed to passthru

As part of the splicing the build/host/target combinations of the interpreter need to be passed around internally. The chosen names were not very clear, implying they were package sets whereas actually there were derivations.

commit6cf25f9dbdef12c36748f322f7414a1d04c8dcd7 authorFrederik Rietdijk <fridh@fridh.nl> dateSat 28 Nov 2020, 16:56 (6 years ago) parent8220b04
4 files changed+27−27
compare with master
unifiedsplit
pkgs/development/interpreters/python/cpython/2.7/default.nix+5−5 pkgs/development/interpreters/python/cpython/default.nix+5−5 pkgs/development/interpreters/python/default.nix+12−12 pkgs/development/interpreters/python/pypy/default.nix+5−5
pkgs/development/interpreters/python/cpython/2.7/default.nix+5−5
@@ -50,11 +50,11 @@ let
5050 pythonVersion = with sourceVersion; "${major}.${minor}";
5151 sitePackages = "lib/${libPrefix}/site-packages";
5252 inherit hasDistutilsCxxPatch;
53− pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
54− pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
55− pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
56− pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
57− pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
53+ pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
54+ pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
55+ pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
56+ pythonOnHostForHost = pkgsHostHost.${pythonAttr};
57+ pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
5858 } // {
5959 inherit ucsEncoding;
6060 };
pkgs/development/interpreters/python/cpython/default.nix+5−5
@@ -68,11 +68,11 @@ let
6868 pythonVersion = with sourceVersion; "${major}.${minor}";
6969 sitePackages = "lib/${libPrefix}/site-packages";
7070 inherit hasDistutilsCxxPatch;
71− pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
72− pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
73− pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
74− pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
75− pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
71+ pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
72+ pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
73+ pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
74+ pythonOnHostForHost = pkgsHostHost.${pythonAttr};
75+ pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
7676 };
7777
7878 version = with sourceVersion; "${major}.${minor}.${patch}${suffix}";
pkgs/development/interpreters/python/default.nix+12−12
@@ -14,12 +14,12 @@ with pkgs;
1414 , packageOverrides
1515 , sitePackages
1616 , hasDistutilsCxxPatch
17− , pythonPackagesBuildBuild
18− , pythonPackagesBuildHost
19− , pythonPackagesBuildTarget
20− , pythonPackagesHostHost
21− , self # is pythonPackagesHostTarget
22− , pythonPackagesTargetTarget
17+ , pythonOnBuildForBuild
18+ , pythonOnBuildForHost
19+ , pythonOnBuildForTarget
20+ , pythonOnHostForHost
21+ , pythonOnTargetForTarget
22+ , self # is pythonOnHostForTarget
2323 }: let
2424 pythonPackages = callPackage
2525 ({ pkgs, stdenv, python, overrides }: let
@@ -28,11 +28,11 @@ with pkgs;
2828 python = self;
2929 };
3030 otherSplices = {
31− selfBuildBuild = pythonPackagesBuildBuild;
32− selfBuildHost = pythonPackagesBuildHost;
33− selfBuildTarget = pythonPackagesBuildTarget;
34− selfHostHost = pythonPackagesHostHost;
35− selfTargetTarget = pythonPackagesTargetTarget;
31+ selfBuildBuild = pythonOnBuildForBuild;
32+ selfBuildHost = pythonOnBuildForHost;
33+ selfBuildTarget = pythonOnBuildForTarget;
34+ selfHostHost = pythonOnHostForHost;
35+ selfTargetTarget = pythonOnTargetForTarget;
3636 };
3737 keep = self: {
3838 # TODO maybe only define these here so nothing is needed to be kept in sync.
@@ -100,7 +100,7 @@ with pkgs;
100100 pythonAtLeast = lib.versionAtLeast pythonVersion;
101101 pythonOlder = lib.versionOlder pythonVersion;
102102 inherit hasDistutilsCxxPatch;
103− pythonForBuild = pythonPackagesBuildHost;
103+ pythonForBuild = pythonOnBuildForHost;
104104
105105 tests = callPackage ./tests.nix {
106106 python = self;
pkgs/development/interpreters/python/pypy/default.nix+5−5
@@ -31,11 +31,11 @@ let
3131 sitePackages = "site-packages";
3232 hasDistutilsCxxPatch = false;
3333
34− pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr};
35− pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr};
36− pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr};
37− pythonPackagesHostHost = pkgsHostHost.${pythonAttr};
38− pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {};
34+ pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr};
35+ pythonOnBuildForHost = pkgsBuildHost.${pythonAttr};
36+ pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr};
37+ pythonOnHostForHost = pkgsHostHost.${pythonAttr};
38+ pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {};
3939 };
4040 pname = passthru.executable;
4141 version = with sourceVersion; "${major}.${minor}.${patch}";