release-cross.nix: fix the fix in #188339 #230455
Merged
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
ofborg
bot
added
the
6.topic: cross-compilation
github-actions
bot
added
6.topic: python
6.topic: qt/kde
and removed
6.topic: qt/kde
6.topic: python
labels
ghost
added
the
0.kind: ZHF Fixes
ofborg
bot
added
10.rebuild-darwin: 0
The `bootstrapTools.bootstrapTools` attribute, which *unpacks* the bootstrapFiles, lies about its `system`: https://github.com/NixOS/nixpkgs/blob/78963777a40a63333520c5c8f4567b4059b68c4d/pkgs/stdenv/linux/make-bootstrap-tools.nix#L236 Unfortunately because of this, when building `bootstrapTools.*`, Hydra will try to execute the cross-compiled bootstrapFiles' `busybox` on the wrong architecture, and fail. I originally submitted a fix for this, by filtering out the `.bootstrapTools` attribute, in #188339 Unfortunately my fix filtered at the wrong level of the attrset hierarchy, and neglected to filter the `test` attribute as well. This PR corrects those mistakes
ghost
marked this pull request as ready for review
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.
Description of changes
The
bootstrapTools.bootstrapToolsattribute, which unpacks the bootstrapFiles, lies about itssystem:nixpkgs/pkgs/stdenv/linux/make-bootstrap-tools.nix
Line 247 in 7896377
Unfortunately because of this, when building
bootstrapTools.*, Hydra will try to execute the cross-compiled bootstrapFiles'busyboxon the wrong architecture, and fail.I originally submitted a fix for this, by filtering out the
.bootstrapToolsattribute, in #188339Unfortunately my fix filtered at the wrong level of the attrset hierarchy, and neglected to filter the
testattribute as well. This PR corrects those mistakesThis PR should fix 16 of the current Hydra failures:
Things done