Skip to content

Revert "qt5.qtbase: fix cross"#251681

Merged
samueldr merged 1 commit intomasterfrom
revert-227900-pr/qtbase/fixcross
Aug 27, 2023
Merged

Revert "qt5.qtbase: fix cross"#251681
samueldr merged 1 commit intomasterfrom
revert-227900-pr/qtbase/fixcross

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 platform than they will be used on label Aug 26, 2023
@github-actions github-actions bot added the 6.topic: qt/kde Object-oriented framework for GUI creation 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.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Aug 26, 2023
@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
@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

Labels

6.topic: cross-compilation Building packages on a different platform than they will be used on 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants