qt5, libsForQt5: 5.12 -> 5.14 on darwin#168524
Merged
ttuegel merged 2 commits intoNixOS:masterfrom Apr 14, 2022
Merged
Conversation
9c9b406 to
a88af94
Compare
ttuegel
approved these changes
Apr 14, 2022
Contributor
Author
|
Thanks! |
jiegec
reviewed
Aug 1, 2022
| 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; |
Member
There was a problem hiding this comment.
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
This file contains hidden or 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
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
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
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes