qt5: 5.11.0 -> 5.11.1 #42351

averelld · 2018-06-21T22:12:23Z

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.

Fixes NixOS#42387. See also NixOS#42351 for information on Qt breakage.

xeji · 2018-06-24T19:28:32Z

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

bkchr · 2018-06-25T12:22:15Z

pkgs/development/libraries/qt-5/modules/qtwebkit.nix

@@ -23,15 +23,15 @@ let
 in
 qtModule {
  name = "qtwebkit";
-  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ qtwebchannel ];
+  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.1") [ qtwebchannel ];


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

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

xeji · 2018-06-25T16:27:33Z

@GrahamcOfBorg build qt511.qtbase

GrahamcOfBorg · 2018-06-25T16:41:51Z

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 · 2018-06-25T17:03:18Z

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 · 2018-06-25T17:06:07Z

@GrahamcOfBorg build qt511.qmake qt511.qttools

GrahamcOfBorg · 2018-06-25T17:10:32Z

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 · 2018-06-25T17:35:57Z

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 · 2018-06-25T18:41:02Z

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 · 2018-06-25T19:23:56Z

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 · 2018-06-27T20:25:00Z

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.

orivej · 2018-07-05T02:26:39Z

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 · 2018-07-05T04:25:05Z

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

This reverts commit 1999d27.

averelld requested a review from ttuegel as a code owner June 21, 2018 22:12

averelld mentioned this pull request Jun 21, 2018

Quassel fails to build with Qt 5.11 #42352

Closed

GrahamcOfBorg added 6.topic: qt/kde 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ labels Jun 21, 2018

This was referenced Jun 22, 2018

rstudio: fix build to use compatible boost version #42383

Merged

MultiMC v0.6.2 fails to build with Qt 5.11 #42387

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.

averelld force-pushed the qt5-minor-upgrade branch from 00d2079 to e26f280 Compare June 24, 2018 21:25

averelld requested a review from FRidh as a code owner June 24, 2018 21:25

averelld changed the base branch from master to staging June 24, 2018 21:25

GrahamcOfBorg added 6.topic: python 8.has: documentation 2.status: merge conflict and removed 6.topic: python 8.has: documentation 2.status: merge conflict labels Jun 24, 2018

bkchr reviewed Jun 25, 2018

View reviewed changes

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

jgillich mentioned this pull request Jun 27, 2018

sqlitebrowser not building #42320

Closed

orivej-nixos force-pushed the qt5-minor-upgrade branch from 6db4bd5 to 7e3d761 Compare July 5, 2018 02:35

averelld requested review from edolstra, nbp, peti and Profpatsch as code owners July 5, 2018 02:35

orivej-nixos changed the base branch from staging to master July 5, 2018 02:35

orivej-nixos removed request for peti, edolstra, nbp and Profpatsch July 5, 2018 02:35

orivej-nixos merged commit 1999d27 into NixOS:master Jul 5, 2018

GrahamcOfBorg added 6.topic: emacs 6.topic: haskell 6.topic: nixos 6.topic: printing 6.topic: python 6.topic: vim 8.has: documentation 8.has: module (update) 8.has: clean-up 8.has: package (new) 10.rebuild-darwin: 501+ and removed 10.rebuild-darwin: 101-500 labels Jul 5, 2018

orivej mentioned this pull request Jul 5, 2018

sqlitebrowser: fix build #43047

Closed

9 tasks

orivej-nixos mentioned this pull request Jul 5, 2018

owncloud-client-2.4.1 fails to build: Unknown CMake command "qt5_use_modules". #43025

Closed

averelld deleted the qt5-minor-upgrade branch July 6, 2018 14:36

orivej mentioned this pull request Jul 8, 2018

qsyncthingtray: fix compile with Qt 5.11 #43158

Closed

9 tasks

samueldr added a commit to samueldr/nixpkgs that referenced this pull request Jul 27, 2018

Revert "qt5: 5.11.0 -> 5.11.1 (NixOS#42351)"

9e857e4

This reverts commit 1999d27.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

qt5: 5.11.0 -> 5.11.1 #42351

qt5: 5.11.0 -> 5.11.1 #42351

averelld commented Jun 21, 2018 •

edited

xeji commented Jun 24, 2018

bkchr Jun 25, 2018

averelld Jun 25, 2018

xeji commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

xeji commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

jgillich commented Jun 27, 2018

orivej commented Jul 5, 2018

orivej commented Jul 5, 2018

qt5: 5.11.0 -> 5.11.1 #42351

qt5: 5.11.0 -> 5.11.1 #42351

Conversation

averelld commented Jun 21, 2018 • edited

Motivation for this change

Things done

xeji commented Jun 24, 2018

bkchr Jun 25, 2018

Choose a reason for hiding this comment

averelld Jun 25, 2018

Choose a reason for hiding this comment

xeji commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

xeji commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

GrahamcOfBorg commented Jun 25, 2018

jgillich commented Jun 27, 2018

orivej commented Jul 5, 2018

orivej commented Jul 5, 2018

averelld commented Jun 21, 2018 •

edited