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

qt5, libsForQt5: 5.12 -> 5.14 on darwin #168524

Merged
merged 2 commits into from
Apr 14, 2022
Merged

Conversation

willcohen
Copy link
Contributor

Description of changes

While (as noted in #125548) qtwebengine and therefore qtfull will require the SDK bump for darwin at #101229, Qt 5.12 reached EOL in December 2021. As such, since both 5.12 and 5.14 are both now EOL, it may now be prudent to bump macOS's default to 5.14 pending the SDK bump, to at least bring the software to a EOL-and-from-2019 version rather than an EOL-and-from-2018 version.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Apr 13, 2022
@willcohen willcohen mentioned this pull request Apr 13, 2022
10 tasks
@ttuegel ttuegel merged commit e516ffb into NixOS:master Apr 14, 2022
@willcohen
Copy link
Contributor Author

Thanks!

@willcohen willcohen deleted the qt-5.14-darwin branch April 14, 2022 14:29
qt5 = if stdenv.hostPlatform.isDarwin then qt512 else qt515;
libsForQt5 = if stdenv.hostPlatform.isDarwin then libsForQt512 else libsForQt515;
# TODO bump to 5.15 on darwin once it's not broken; see #125548
qt5 = if stdenv.hostPlatform.isDarwin then qt514 else qt515;
Copy link
Contributor

@jiegec jiegec Aug 1, 2022

Choose a reason for hiding this comment

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

Qt 5.15 is working on both x86_64-darwin and aarch64-darwin now (as of #180327).

Build Status for libsForQt515.qtbase.aarch64-darwin on nixpkgs/staging-next
✔ qtbase-5.15.5 from 2022-07-30 - https://hydra.nixos.org/build/185784694
Build Status for libsForQt515.qtbase.x86_64-darwin on nixpkgs/staging-next
✔ qtbase-5.15.5 from 2022-07-30 - https://hydra.nixos.org/build/185777883

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