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.10 -> 5.11 #41095

Merged
merged 8 commits into from Jun 15, 2018
Merged

qt5: 5.10 -> 5.11 #41095

merged 8 commits into from Jun 15, 2018

Conversation

bkchr
Copy link
Contributor

@bkchr bkchr commented May 26, 2018 •
edited

Motivation for this change

@ttuegel @adisbladis @peterhoeg

@LnL7 could you try this on Mac Os?

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

@bkchr bkchr requested review from FRidh and ttuegel as code owners May 26, 2018 07:16
LnL7
LnL7 reviewed May 27, 2018
View reviewed changes
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.

The darwin patch don't apply anymore.

@bkchr
Copy link
Contributor Author

bkchr commented May 27, 2018

Ohh -.- I did not realized that there are Darwin exclusive patches... I'm on it ^^

@LnL7
Copy link
Member

LnL7 commented May 27, 2018

Yeah, I moved them to a separate patch file since they got lost a bunch of times with the update workflow. Let me know if I should look at it, it's just getting rid of CF template types since that's not supported in 10.10 yet.

@bkchr
Copy link
Contributor Author

bkchr commented May 28, 2018

@LnL7 I updated the darwin patch as well, so it would be nice if you could test it.

@bkchr
Copy link
Contributor Author

bkchr commented May 31, 2018

@LnL7 ping.

@LnL7
Copy link
Member

LnL7 commented May 31, 2018

Sorry I've been preoccupied with fallout from the staging merge. Looks like this needs a bit more work tho, here's the log if somebody else has time otherwise I'll try to look at it next week. https://gist.github.com/LnL7/55082fa49f2c83eb164ca1ea2be34858

@bkchr
Copy link
Contributor Author

bkchr commented Jun 5, 2018

Related: #41483

@FRidh FRidh changed the title Qt 5.11 qt5: 5.10 -> 5.11 Jun 5, 2018
@bkchr
Copy link
Contributor Author

bkchr commented Jun 10, 2018

@LnL7 does it now work on Mac Os?

@LnL7
Copy link
Member

LnL7 commented Jun 10, 2018

Yeah, everything except for qtwebkit and qtwebengine work now. Upstream removed support for 10.10 so it became even more painful to fix. 😕

Anything else that should be done?

@bkchr
Copy link
Contributor Author

bkchr commented Jun 10, 2018

Do we need qtwebengine/qtwebkit for Mac OS?
Can we not also drop support for 10.10?

@LnL7
Copy link
Member

LnL7 commented Jun 11, 2018

@bkchr Those where broken before so this is good to go for darwin, but looks an evaluation issue was introduced in the mean time.

We can't upgrade the sdk like we normally would because apple still has not opensourced one of the core components for 10.11, so that requires overhauling part of the stdenv an introduces another impurity which we've been trying to avoid until now.

@bkchr
Copy link
Contributor Author

bkchr commented Jun 11, 2018

@LnL7 thank you for pushing your patches again. I did not thought, before pushing my fixes..

@LnL7
Copy link
Member

LnL7 commented Jun 11, 2018

It's git, nothing is ever really lost. 😄

LnL7
LnL7 approved these changes Jun 11, 2018
View reviewed changes
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.

I can merge this, but I'd prefer it if somebody who knows more about qt also takes a look.

@bkchr
qt5: 5.10 -> 5.11
b785d48 
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
@bkchr
sddm: Fixes build with Qt 5.11
6c46706
bkchr and others added 5 commits June 12, 2018 14:27
@bkchr
konversation: Fixes build with Qt 5.11
a95a38f
@bkchr
phonon: 4.9.1 -> 4.10.1
5fe81d0 
This update fixes also the compilation with Qt 5.11.
@bkchr
pyqt5: Fixes build with Qt 5.11
121b15f
@LnL7 @bkchr
qt5: revert qtbase commit that removes macOS 10.10 code paths
4ed62d6 
We use MACOSX_DEPLOYMENT_TARGET=10.10 in nixpkgs and some darwin
packages like CoreFoundation are based on the 10.10 sources from
opensource.apple.com.
@LnL7 @bkchr
qt5: update darwin patch for 5.11
738df73
lukateras
lukateras reviewed Jun 15, 2018
View reviewed changes
pkgs/top-level/all-packages.nix
@@ -11307,10 +11307,10 @@ with pkgs;

libsForQt59 = lib.makeScope qt59.newScope mkLibsForQt5;

qt510 = recurseIntoAttrs (makeOverridable
(import ../development/libraries/qt-5/5.10) {
qt511 = recurseIntoAttrs (makeOverridable
Copy link
Member

Choose a reason for hiding this comment

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

If we remove each minor Qt version on each update, it doesn't seem there is much sense in keeping unstable attribute for that around.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Which unstable attribute? But we just remove none Lts versions. I think that is enough to have Lts and latest stable.

@lukateras lukateras merged commit bae863e into NixOS:master Jun 15, 2018
@peti peti mentioned this pull request Jun 17, 2018
Closed
@peti
Copy link
Member

peti commented Jun 17, 2018

This update broke LyX: #42124.

Synthetica9 added a commit to Synthetica9/nixpkgs that referenced this pull request Jun 24, 2018
@Synthetica9
keepassxc: use qt5.9 instead of latest qt5
97ec993 
Broke with NixOS#41095
@Synthetica9 Synthetica9 mentioned this pull request Jun 24, 2018
Closed
9 tasks
@xeji xeji mentioned this pull request Jun 29, 2018
Closed
@telent
Copy link
Contributor

telent commented Sep 24, 2018

Do we need qtwebengine/qtwebkit for Mac OS?

I don't know who "we" refers to in this scenario, but as a Nix-on-Darwin user at work, I need qtwebkit to build capybara-webkit, which we use for running headless integration/acceptance tests on our web app. So personally I'd welcome it if this can be made to work

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukateras lukateras lukateras left review comments

@LnL7 LnL7 LnL7 approved these changes

@FRidh FRidh Awaiting requested review from FRidh

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

Assignees
No one assigned
Labels
6.topic: python 6.topic: qt/kde 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@bkchr @LnL7 @peti @telent @lukateras @GrahamcOfBorg