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

Jump to bottom

Replay Qt 5.12.3 version bump #66266

Merged
merged 2 commits into from Aug 9, 2019
Merged

Replay Qt 5.12.3 version bump #66266

merged 2 commits into from Aug 9, 2019

Conversation

ttuegel
Copy link
Member

@ttuegel ttuegel commented Aug 7, 2019 •
edited

Motivation for this change

#64598 was reverted for causing segfaults (see #65448). The strict compatibility enforced by #65526 prevents the problem from recurring.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc @

@ofborg ofborg bot requested review from qknight and periklis August 7, 2019 11:42
@ttuegel
Copy link
Member Author

ttuegel commented Aug 7, 2019

@GrahamcOfBorg test plasma5

samueldr
samueldr approved these changes Aug 8, 2019
View reviewed changes
Copy link
Member

@samueldr samueldr left a comment

Choose a reason for hiding this comment

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

Validated that (1) by reverting #65526 this bump would fail, and that (2) it doesn't fail as it is.

This is good to go.

@ttuegel
Copy link
Member Author

ttuegel commented Aug 9, 2019

@samueldr Thanks for checking this out for me! 😄

@ttuegel ttuegel merged commit 37b402b into NixOS:staging Aug 9, 2019
@peterhoeg
Copy link
Member

This is slightly off-topic but I have a shit-ton of changes (frameworks, plasma, applications) that I wanted to see if it had to go into staging, only to see that various people had already done all the work. Gaaaarrrggghhhhh. Note to future self - check staging before taking on bigger bits.

@vcunat
Copy link
Member

vcunat commented Aug 20, 2019

It won't build on darwin: https://hydra.nixos.org/build/98889958

@vcunat vcunat mentioned this pull request Aug 20, 2019
Merged
10 tasks
@matthewbauer
Copy link
Member

matthewbauer commented Aug 20, 2019 •
edited

Most likely we need to update the qtbase patch to fix the error, I think

@vcunat
Copy link
Member

vcunat commented Aug 25, 2019

BTW, I see several Qt apps now fail to build with "incomplete type" messages. I assume it's just some header reorganization and adding includes will fix that relatively easily, as this PR was just a patch-number bump.

@vcunat
Copy link
Member

vcunat commented Sep 1, 2019

It's now in master, including the problems I posted about.

@vcunat
Copy link
Member

vcunat commented Sep 1, 2019

Oh, I didn't realize that we have

{
 libsForQt5 = if stdenv.isDarwin then libsForQt511 else libsForQt512;
}

so the breakage of 5.12 on darwin doesn't seem too significant, though qt5 = qt512; isn't consistent with that, so that confused me a bit. @matthewbauer: the inconsistency was introduced in #63707 – was that even intentional?

vcunat added a commit that referenced this pull request Sep 6, 2019
@vcunat
qt5 on darwin: revert back to 5.11
2a79106 
5.12 has been broken again, nad libsForQt5 has never been switched
anyway.  This should unblock the nixpkgs channel.  Discussion thread:
#66266 (comment)
@vcunat
Copy link
Member

vcunat commented Sep 6, 2019

I switched Darwin back to 5.11 for now: 2a79106 🤷‍♀️

@adisbladis
Copy link
Member

I've applied a patch and fixed qt512.qtbase in #72999.

We have to bump the Qt version on Darwin as Qt 5.11 does not build with latest mesa.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samueldr samueldr samueldr approved these changes

@qknight qknight Awaiting requested review from qknight

@periklis periklis Awaiting requested review from periklis

Assignees
No one assigned
Labels
6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ttuegel @peterhoeg @vcunat @matthewbauer @adisbladis @samueldr