Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "qt5.qtbase: fix cross" #251681

Merged
merged 1 commit into from
Aug 27, 2023
Merged

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Aug 26, 2023

Reverts #227900

This change should have gone through staging, as it is definitely a mass rebuild.

cc @amjoseph-nixpkgs @vcunat @RaitoBezarius @dotlambda.

Feel free to re-open targeting the appropriate branch.

@samueldr samueldr requested a review from ttuegel as a code owner August 26, 2023 23:09
@ofborg ofborg bot added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Aug 26, 2023
Copy link
Member

@ckiee ckiee left a comment

Choose a reason for hiding this comment

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

Given the massive (10251) amount of rebuilds (ofborg-eval) in the original PR, it's important we revert it before the next hydra eval (~9h I think?) regardless of the PR's merits.

@RaitoBezarius
Copy link
Member

RaitoBezarius commented Aug 26, 2023 via email

@samueldr
Copy link
Member Author

samueldr commented Aug 26, 2023

I can cancel jobs, too, I believe, if it is needed... (Though I'm unsure, it may be limited to Mobile NixOS.)

@samueldr samueldr merged commit 4840a9c into master Aug 27, 2023
23 checks passed
@samueldr samueldr deleted the revert-227900-pr/qtbase/fixcross branch August 27, 2023 01:01
tjni added a commit that referenced this pull request Aug 27, 2023
Resolve correctly the three-way merge between #251681,
#227900, and #246022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants