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.

Sign up for GitHub

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

qt5: 5.12.4 -> 5.12.5 #70689

Merged
merged 6 commits into from Oct 14, 2019
Merged

qt5: 5.12.4 -> 5.12.5 #70689

merged 6 commits into from Oct 14, 2019

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Oct 8, 2019

Motivation for this change

Changes to Darwin patch occurred after I originally put this together,
so optimistically reset to what the latest change was -- which may not
apply or make sense for 5.12.5, but we'll see.

Rest I've been using for about a week now, seems good here!

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 @

@dtzWill dtzWill requested a review from ttuegel as a code owner October 8, 2019 00:28
@ttuegel
Copy link
Member

ttuegel commented Oct 8, 2019

🎉

Changes to Darwin patch occurred after I originally put this together,
so optimistically reset to what the latest change was -- which may not
apply or make sense for 5.12.5, but we'll see.

It wasn't working yet, anyway. I don't have a macOS builder, so I have to spam Hydra via staging. 🙁 We really need to get Darwin onto a supported Qt branch (5.12 is LTS, 5.11 is EOL).

ttuegel
ttuegel approved these changes Oct 8, 2019
View reviewed changes
Copy link
Member

@ttuegel ttuegel left a comment

Choose a reason for hiding this comment

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

We should find a way in the future to avoid the noise caused by using Git for patches. I thought we were using quilt at some point, but that must have been on a private branch of mine. Still, it's better than the giant patch-ball-of-mud.

@dtzWill dtzWill merged commit 10f8c46 into NixOS:staging Oct 14, 2019
@dtzWill dtzWill deleted the update/qt5-5.12.5 branch October 14, 2019 23:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel ttuegel approved these changes

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

Successfully merging this pull request may close these issues.

None yet
2 participants
@dtzWill @ttuegel