Python: rename internal parameters related to splicing and fix splicing #105155
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FRidh
force-pushed
the
splice
branch
2 times, most recently
from
d5c8917 to
23dfdc0
Compare
ofborg
bot
added
10.rebuild-darwin: 0
FRidh
changed the title
FRidh
changed the title
Ericson2314
reviewed
Nov 28, 2020
Ericson2314
reviewed
Nov 28, 2020
Ericson2314
reviewed
Nov 28, 2020
Follow-up to NixOS#104201, related to NixOS#105113.
super was incorrectly possible until NixOS#104201 got merged.
FRidh
changed the title
FRidh
commented
Nov 28, 2020
| pythonForBuildOnHost = pkgsBuildHost.${pythonAttr}; | ||
| pythonForBuildOnTarget = pkgsBuildTarget.${pythonAttr}; | ||
| pythonForHostOnHost = pkgsHostHost.${pythonAttr}; | ||
| pythonForTargetOnTarget = pkgsTargetTarget.${pythonAttr} or {}; |
There was a problem hiding this comment.
Maybe have it evaluate to null for TargetOnTarget`? That would be a bit more annoying for selfTargetTarget further down.
Ericson2314
reviewed
Nov 28, 2020
Ericson2314
reviewed
Nov 28, 2020
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.
In the original commit the various builds of Python were added to `otherSplices`, instead of the intended Python package sets.
FRidh
changed the title
Ericson2314
approved these changes
Nov 28, 2020
10 tasks
FRidh
pushed a commit
that referenced
this pull request
Feb 20, 2021
This was broken by #105155. Signed-off-by: Anders Kaseorg <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow-up to #104201, related to #105113.
Motivation for this change
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)