Skip to content

qt5: 5.11.0 -> 5.11.1#42351

Merged
orivej-nixos merged 1 commit intoNixOS:masterfrom
averelld:qt5-minor-upgrade
Jul 5, 2018
Merged

qt5: 5.11.0 -> 5.11.1#42351
orivej-nixos merged 1 commit intoNixOS:masterfrom
averelld:qt5-minor-upgrade

Conversation

@averelld
Copy link
Contributor

@averelld averelld commented Jun 21, 2018 •
edited
Loading

Motivation for this change

This may be needed to unbreak a couple of builds such as nextcloud clients or rstudio (alternatively they would have to downgrade to 5.9 individually if that is even possible): https://codereview.qt-project.org/#/c/232367/

Things done

I only ran the update script and rebased the patches for the sub modules, but maybe there are more steps involved I'm not aware of.

  • 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)
  • Fits CONTRIBUTING.md.

@averelld averelld requested a review from ttuegel as a code owner June 21, 2018 22:12
@averelld averelld mentioned this pull request Jun 21, 2018
Closed
@GrahamcOfBorg GrahamcOfBorg added 6.topic: qt/kde Object-oriented framework for GUI creation 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. labels Jun 21, 2018
This was referenced Jun 22, 2018
Merged
Closed
kliu128 pushed a commit to kliu128/nixpkgs that referenced this pull request Jun 23, 2018
multimc: 0.6.2 → unstable-2018-06-04
28ff1f7 
Fixes NixOS#42387. See also NixOS#42351 for information on Qt breakage.
@xeji
Copy link
Contributor

xeji commented Jun 24, 2018

Please rebase this PR on the staging branch since it causes a large number of rebuilds.

@averelld averelld force-pushed the qt5-minor-upgrade branch from 00d2079 to e26f280 Compare June 24, 2018 21:25
@averelld averelld requested a review from FRidh as a code owner June 24, 2018 21:25
@averelld averelld changed the base branch from master to staging June 24, 2018 21:25
@GrahamcOfBorg GrahamcOfBorg added 6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation 2.status: merge conflict This PR has merge conflicts with the target branch and removed 6.topic: python Python is a high-level, general-purpose programming language. 8.has: documentation This PR adds or changes documentation 2.status: merge conflict This PR has merge conflicts with the target branch labels Jun 24, 2018
bkchr
bkchr reviewed Jun 25, 2018
View reviewed changes
pkgs/development/libraries/qt-5/modules/qtwebkit.nix Outdated
Copy link
Contributor

@bkchr bkchr Jun 25, 2018

Choose a reason for hiding this comment

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

You don't need to modify these lines, it should still work, since 5.11.1 > 5.11.0.

Copy link
Contributor Author

@averelld averelld Jun 25, 2018

Choose a reason for hiding this comment

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

Oops. I thought I had build errors before, but apparently that was unrelated. Reverted and rebased.

@averelld averelld force-pushed the qt5-minor-upgrade branch from e26f280 to 6db4bd5 Compare June 25, 2018 13:33
@xeji
Copy link
Contributor

xeji commented Jun 25, 2018

@GrahamcOfBorg build qt511.qtbase

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Success on x86_64-linux (full log)

Attempted: qt511.qtbase

Partial log (click to expand)

Removing empty /nix/store/rikx45wan2gqq5r3crnnigp4bprf6p5w-qtbase-5.11.1/bin/ and (possibly) its parents
Moving /nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin/uic to /nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/bin/uic
rmdir: failed to remove '/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin': Directory not empty
updateToolPath: Updating `/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin/moc' in `/nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin/qmake' in `/nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin/rcc' in `/nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/lib/cmake/Qt5Core/Qt5CoreConfigExtras.cmake\'...
updateToolPath: Updating `/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin/uic' in `/nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/lib/cmake/Qt5Widgets/Qt5WidgetsConfigExtras.cmake\'...
Moving /nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin/bin to /nix/store/8cn9r3kgswxj03bz3hwfj4dwi61l3mwr-qtbase-5.11.1-dev/bin
rmdir: failed to remove '/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin': Directory not empty
/nix/store/bicax3za35i1swvqjbbzydzg5jwcl4nf-qtbase-5.11.1-bin

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Failure on x86_64-darwin (full log)

Attempted: qt511.qtbase

Partial log (click to expand)

cannot build derivation '/nix/store/9b89lfczxq7407pmsw2sq1kjf0cmw4gd-apple-framework-AGL.drv': 5 dependencies couldn't be built
cannot build derivation '/nix/store/l7zlhkmqpyfna7jf4yqrvp20vha4ki84-apple-framework-AudioUnit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/slbmq08jxwwjc3qbf05z4mrwjfbm5wsq-cairo-1.15.12.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/gq5kyjyf6xq0vwwdljdqpg32mxbxv0n1-apple-framework-AudioToolbox.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/hsrgp18lcfnqyrnrpn91gcqrk2k0syyf-harfbuzz-1.8.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/fs5g4xzxfhhjz99mp6bnsj7grpz3zlgi-apple-framework-AppKit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/5805vzc584677b8sfi412rvsp6sp3ap9-harfbuzz-icu-1.8.0.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/rxfbs80qc7riqhaw6xzyabr50wgkkdqv-apple-framework-Cocoa.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/9y94xbpcar30awrbr28h7mvcyf766qpw-qtbase-5.11.1.drv': 43 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/9y94xbpcar30awrbr28h7mvcyf766qpw-qtbase-5.11.1.drv' failed

@xeji
Copy link
Contributor

xeji commented Jun 25, 2018

@GrahamcOfBorg build qt511.qmake qt511.qttools

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Success on x86_64-linux (full log)

Attempted: qt511.qmake, qt511.qttools

Partial log (click to expand)

fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_designer.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uitools_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_designercomponents_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_help_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_help.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uitools.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/68wpm5zf5a53naxc4bl935pzjgjbh739-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uiplugin.pri'...
postPatchMkspecs
/nix/store/gwxsr6a86whpblzbw74fbvc4q885kv9p-hook
/nix/store/h2y6ab2dh802q5kqx1n8n6f0a48p64f4-qttools-5.11.1

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Failure on x86_64-darwin (full log)

Attempted: qt511.qmake, qt511.qttools

Partial log (click to expand)

cannot build derivation '/nix/store/slbmq08jxwwjc3qbf05z4mrwjfbm5wsq-cairo-1.15.12.drv': 20 dependencies couldn't be built
cannot build derivation '/nix/store/gq5kyjyf6xq0vwwdljdqpg32mxbxv0n1-apple-framework-AudioToolbox.drv': 7 dependencies couldn't be built
cannot build derivation '/nix/store/hsrgp18lcfnqyrnrpn91gcqrk2k0syyf-harfbuzz-1.8.0.drv': 8 dependencies couldn't be built
cannot build derivation '/nix/store/fs5g4xzxfhhjz99mp6bnsj7grpz3zlgi-apple-framework-AppKit.drv': 6 dependencies couldn't be built
cannot build derivation '/nix/store/5805vzc584677b8sfi412rvsp6sp3ap9-harfbuzz-icu-1.8.0.drv': 10 dependencies couldn't be built
cannot build derivation '/nix/store/rxfbs80qc7riqhaw6xzyabr50wgkkdqv-apple-framework-Cocoa.drv': 4 dependencies couldn't be built
cannot build derivation '/nix/store/9y94xbpcar30awrbr28h7mvcyf766qpw-qtbase-5.11.1.drv': 43 dependencies couldn't be built
cannot build derivation '/nix/store/pmksnpjc7j7s2267mj8bi3h2z7vsp29r-hook.drv': 3 dependencies couldn't be built
cannot build derivation '/nix/store/xwxg3mw05qv0gqgf8hz2s4qvdjs0z2ml-qttools-5.11.1.drv': 6 dependencies couldn't be built
�[31;1merror:�[0m build of '/nix/store/pmksnpjc7j7s2267mj8bi3h2z7vsp29r-hook.drv', '/nix/store/xwxg3mw05qv0gqgf8hz2s4qvdjs0z2ml-qttools-5.11.1.drv' failed

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Failure on aarch64-linux (full log)

Attempted: qt511.qtbase

Partial log (click to expand)

shrinking /nix/store/4lb9ngfsmyn63khqi15nqlnprz6aiqn7-gdk-pixbuf-2.36.12-installedTests/libexec/installed-tests/gdk-pixbuf/cve-2015-4491
shrinking /nix/store/4lb9ngfsmyn63khqi15nqlnprz6aiqn7-gdk-pixbuf-2.36.12-installedTests/libexec/installed-tests/gdk-pixbuf/animation
strip is /nix/store/0pjsgkxz0rp5baycq5sp2s72lrr5q9sg-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/4lb9ngfsmyn63khqi15nqlnprz6aiqn7-gdk-pixbuf-2.36.12-installedTests/libexec
patching script interpreter paths in /nix/store/4lb9ngfsmyn63khqi15nqlnprz6aiqn7-gdk-pixbuf-2.36.12-installedTests
/nix/store/gpy3r9ss5ngfkib8ylx7jzgahq7m0x5b-patch-shebangs.sh: line 22: warning: command substitution: ignored null byte in input
checking for references to /build in /nix/store/4lb9ngfsmyn63khqi15nqlnprz6aiqn7-gdk-pixbuf-2.36.12-installedTests...
cannot build derivation '/nix/store/r2qfgqqmq4jjf44n6i8m8fcd34rpzbq5-gtk+3-3.22.30.drv': 1 dependencies couldn't be built
cannot build derivation '/nix/store/w40hr6l9lwbdwf3ay2rshz4nkmc34nks-qtbase-5.11.1.drv': 2 dependencies couldn't be built
error: build of '/nix/store/w40hr6l9lwbdwf3ay2rshz4nkmc34nks-qtbase-5.11.1.drv' failed

@GrahamcOfBorg
Copy link

GrahamcOfBorg commented Jun 25, 2018

Success on aarch64-linux (full log)

Attempted: qt511.qmake, qt511.qttools

Partial log (click to expand)

fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_designer_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_designer.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uitools_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uitools.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_uiplugin.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_help_private.pri'...
fixQtModulePaths: Fixing module paths in `/nix/store/733hix5qkdpqhzb7rf3xadvgrbiviqk3-qttools-5.11.1-dev/mkspecs/modules/qt_lib_help.pri'...
postPatchMkspecs
/nix/store/kpqr9l574d6qn5zd36hc6xh2sxy6vmk3-hook
/nix/store/96812fjlpyhllagqg0p18w7569n3cq2f-qttools-5.11.1

@jgillich
Copy link
Member

jgillich commented Jun 27, 2018

The upgrade to Qt 5.11 caused a lot of breakage due to the removal of qt5_use_modules. Maybe we can make an exception here, because the alternative would also require a lot of rebuilds? I'd rather not have a broken system while waiting for a staging merge.

@jgillich jgillich mentioned this pull request Jun 27, 2018
Closed
@orivej
Copy link
Contributor

orivej commented Jul 5, 2018

I'm going to merge this into master because this is not extremely large (rebuild-amount says 154 darwin, 963 linux) and quite beneficial for cmake-based Qt projects.

@orivej-nixos orivej-nixos changed the base branch from staging to master July 5, 2018 02:35
@orivej-nixos orivej-nixos merged commit 1999d27 into NixOS:master Jul 5, 2018
@GrahamcOfBorg GrahamcOfBorg added 6.topic: emacs Text editor 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: vim Advanced text editor 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: clean-up This PR removes packages or removes other cruft 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. and removed 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. labels Jul 5, 2018
@orivej orivej mentioned this pull request Jul 5, 2018
Closed
9 tasks
@orivej
Copy link
Contributor

orivej commented Jul 5, 2018

Hydra has already successfully built sqlitebrowser, qsynth, photoqt, etc.: https://hydra.nixos.org/eval/1467339

@orivej-nixos orivej-nixos mentioned this pull request Jul 5, 2018
Closed
@averelld averelld deleted the qt5-minor-upgrade branch July 6, 2018 14:36
@orivej orivej mentioned this pull request Jul 8, 2018
Closed
9 tasks
samueldr added a commit to samueldr/nixpkgs that referenced this pull request Jul 27, 2018
@samueldr
Revert "qt5: 5.11.0 -> 5.11.1 (NixOS#42351)"
9e857e4 
This reverts commit 1999d27.
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

@FRidh FRidh Awaiting requested review from FRidh

1 more reviewer

@bkchr bkchr bkchr left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: emacs Text editor 6.topic: haskell General-purpose, statically typed, purely functional programming language 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: printing Drivers, CUPS & Co. 6.topic: python Python is a high-level, general-purpose programming language. 6.topic: qt/kde Object-oriented framework for GUI creation 6.topic: vim Advanced text editor 8.has: clean-up This PR removes packages or removes other cruft 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@averelld @xeji @GrahamcOfBorg @jgillich @orivej @bkchr @orivej-nixos