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: 5.11 -> 5.12 #52006

Merged
merged 1 commit into from Dec 19, 2018
Merged

qt5: 5.11 -> 5.12 #52006

merged 1 commit into from Dec 19, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented Dec 14, 2018

Motivation for this change

@LnL7 could you test this on Mac Os?

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.

Copy link
Member

@LnL7 LnL7 left a comment

Choose a reason for hiding this comment

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

No regressions on darwin.

@LnL7
Copy link
Member

LnL7 commented Dec 14, 2018

Err nevermind that was still 5.11, rebuilding...

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.

Looks good to me! Do you have the source for the patches in Git somewhere?

@bkchr
Copy link
Contributor Author

bkchr commented Dec 16, 2018

@ttuegel No, I don't have the patches in git somewhere. I just make apply them manually and refresh them as needed.

@FRidh FRidh changed the base branch from master to staging December 19, 2018 08:14
@FRidh FRidh merged commit 8e811ec into NixOS:staging Dec 19, 2018
@bkchr
Copy link
Contributor Author

bkchr commented Dec 19, 2018

@FRidh did you test it on macos?

@bkchr bkchr deleted the qt_5_12 branch December 19, 2018 08:31
@FRidh
Copy link
Member

FRidh commented Dec 19, 2018

no

@matthewbauer
Copy link
Member

It looks like one of the macOS patches is broken on master:

https://hydra.nixos.org/build/86897293

I think it just needs to be updated>

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.

None yet

6 participants