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

qt59: 5.9.3 -> 5.9.7 #54787

Merged
merged 2 commits into from Jan 29, 2019
Merged

qt59: 5.9.3 -> 5.9.7 #54787

merged 2 commits into from Jan 29, 2019

Conversation

FlorianFranzen
Copy link
Contributor

@FlorianFranzen FlorianFranzen commented Jan 28, 2019 •
edited

Motivation for this change

Updates Qt 5.9.3 to 5.9.7

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 nox --run "nox-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl

This comment has been minimized.

Sign in to view
@FlorianFranzen
Copy link
Contributor Author

Looks like I will have to reworks some of the Darwin patches.

@veprbl
Revert "qt59-qtbase: fix darwin build with clang-5"
fd75bbc 
The fix is already included in Qt 5.9.7

This reverts commit 0bf153f.
@veprbl

This comment has been minimized.

Sign in to view
@FlorianFranzen
Copy link
Contributor Author

@veprbl Thanks, good catch. It seems to build on Darwin now as well. Looks like a few build workers reset though.

@veprbl
Copy link
Member

veprbl commented Jan 29, 2019 •
edited

I ran nix-review on linux, the only build failure is csound-qt, but it's not due to this PR: https://hydra.nixos.org/job/nixpkgs/trunk/csound-qt.x86_64-linux/all?page=1

@veprbl
Copy link
Member

veprbl commented Jan 29, 2019

Ok, let's merge. I will take a look again once hydra updates the cache.

@veprbl veprbl merged commit 571e44b into NixOS:master Jan 29, 2019
@veprbl veprbl self-assigned this Jan 29, 2019
@veprbl
Copy link
Member

veprbl commented Jan 30, 2019

One build failure so far complains about the hash of a tarball:
https://hydra.nixos.org/build/88060633
This is fine when I do it locally and it was fine when ofborg built it. Will wait to see if it goes away.

@veprbl veprbl added 9.needs: port to stable A PR needs a backport to the stable release. 1.severity: security labels Feb 2, 2019
@veprbl
Copy link
Member

veprbl commented Feb 2, 2019 •
edited

In light of #54986 this needs to be backported Backported in #55089

@veprbl veprbl removed their assignment Mar 5, 2019
@veprbl veprbl added 8.has: port to stable A PR already has a backport to the stable release. and removed 9.needs: port to stable A PR needs a backport to the stable release. labels Mar 14, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttuegel ttuegel Awaiting requested review from ttuegel ttuegel is a code owner

Assignees
No one assigned
Labels
1.severity: security 6.topic: qt/kde 8.has: port to stable A PR already has a backport to the stable release. 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@FlorianFranzen @veprbl @GrahamcOfBorg