Skip to content

Python: rename internal parameters related to splicing and fix splicing#105155

Merged
Ericson2314 merged 5 commits intoNixOS:masterfrom
FRidh:splice
Nov 28, 2020
Merged

Python: rename internal parameters related to splicing and fix splicing#105155
Ericson2314 merged 5 commits intoNixOS:masterfrom
FRidh:splice

Conversation

@FRidh
Copy link
Member

@FRidh FRidh commented Nov 27, 2020 •
edited
Loading

Follow-up to #104201, related to #105113.

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Nov 27, 2020
@FRidh FRidh force-pushed the splice branch 2 times, most recently from d5c8917 to 23dfdc0 Compare November 27, 2020 16:03
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Nov 27, 2020
@FRidh FRidh changed the title WIP Python: use pythonPackagesBuildHost.pkg.python instead of pythonF… WIP Python: use pythonPackagesBuildHost instead of pythonForBuild Nov 27, 2020
@FRidh FRidh changed the title WIP Python: use pythonPackagesBuildHost instead of pythonForBuild Python: use pythonPackagesBuildHost instead of pythonForBuild Nov 27, 2020
@FRidh FRidh marked this pull request as ready for review November 27, 2020 17:11
Ericson2314
Ericson2314 reviewed Nov 28, 2020
View reviewed changes
Ericson2314
Ericson2314 reviewed Nov 28, 2020
View reviewed changes
Ericson2314
Ericson2314 reviewed Nov 28, 2020
View reviewed changes
@FRidh
python.tests: use self.callPackage instead of super.callPackage
8220b04 
super was incorrectly possible until NixOS#104201
got merged.
@FRidh FRidh changed the title Python: use pythonPackagesBuildHost instead of pythonForBuild Python: rename internal parameters related to spliciing and fix splicing Nov 28, 2020
FRidh
FRidh commented Nov 28, 2020
View reviewed changes
pkgs/development/interpreters/python/cpython/default.nix Outdated
Copy link
Member Author

@FRidh FRidh Nov 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe have it evaluate to null for TargetOnTarget`? That would be a bit more annoying for selfTargetTarget further down.

Ericson2314
Ericson2314 reviewed Nov 28, 2020
View reviewed changes
Ericson2314
Ericson2314 reviewed Nov 28, 2020
View reviewed changes
FRidh added 3 commits November 28, 2020 17:36
@FRidh
Python: rename parameters and arguments passed to passthru
6cf25f9 
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.
@FRidh
Python splicing: splice package sets, not Python derivation
5804c8a 
In the original commit the various builds of Python were added to
`otherSplices`, instead of the intended Python package sets.
@FRidh
Python: add todo note regarding pythonForBuild
455774e
@FRidh FRidh changed the title Python: rename internal parameters related to spliciing and fix splicing Python: rename internal parameters related to splicing and fix splicing Nov 28, 2020
@Ericson2314 Ericson2314 merged commit 2622548 into NixOS:master Nov 28, 2020
@FRidh FRidh deleted the splice branch November 28, 2020 17:35
@andersk andersk mentioned this pull request Feb 14, 2021
Merged
10 tasks
FRidh pushed a commit that referenced this pull request Feb 20, 2021
@andersk @FRidh
pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost
d08ec2f 
This was broken by #105155.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Ericson2314 Ericson2314 Ericson2314 approved these changes

@adisbladis adisbladis Awaiting requested review from adisbladis

Assignees

No one assigned

Labels

6.topic: python Python is a high-level, general-purpose programming language. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@FRidh @Ericson2314