pyqt5: make qtwebkit optional, disable by default by veprbl · Pull Request #51846 · NixOS/nixpkgs

veprbl · 2018-12-10T21:27:55Z

Motivation for this change

qtwebkit appears to be unsupported in Qt 5.11. We are using some old port

nixpkgs/pkgs/development/libraries/qt-5/5.11/default.nix

Lines 39 to 48 in 475d653

    
           # Community port of the now unmaintained upstream qtwebkit. 
        
           qtwebkit = { 
        
             src = fetchFromGitHub { 
        
               owner = "annulen"; 
        
               repo = "webkit"; 
        
               rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8"; 
        
               sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf"; 
        
             }; 
        
             version = "5.212-alpha-01-26-2018"; 
        
           };

and it is broken on darwin. We are likely will be looking to be phasing out QtWebKit in the future as it will break and have more and more security problems. It is nice to have packages that still rely on it to be marked out.

Things done

veprbl · 2018-12-10T21:33:14Z

@GrahamcOfBorg build python27Packages.pyqt5 python37Packages.pyqt5

veprbl · 2018-12-11T01:12:35Z

I guess I should not remove QtWebEngine...

veprbl · 2018-12-14T17:19:13Z

This is ready for review now

veprbl · 2018-12-20T21:49:50Z

@GrahamcOfBorg build python2Packages.jupyter python3Packages.jupyter

veprbl · 2018-12-20T22:04:50Z

@GrahamcOfBorg build python2Packages.jupyter python3Packages.jupyter

* python36Packages.qtconsole: 4.4.2 -> 4.4.3 (#50590) Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-qtconsole/versions * pythonPackages.qtconsole: linux platforms only

FRidh

Looks good to me. Do add the comment.

FRidh · 2018-12-26T09:09:14Z

pkgs/top-level/python-packages.nix

Could you add a comment here explaining that this one should not be used by any Python libraries (so pkgs/development/python-modules/*) to avoid potential collisions.

There can still be a collision on application level. Should I we move pyqt5_with_qtwebkit uses from propagatedBuildInputs to wrappers modifying PYTHONPATH? Or maybe use python.withPackages?

Since about 5 hydra evaluations ago the build log has: substituteStream(): WARNING: pattern 'install_dir=pydbusmoddir' doesn't match anything in file 'configure.py' substituteStream(): WARNING: pattern 'ModuleMetadata(qmake_QT=['webkitwidgets'])' doesn't match anything in file 'configure.py' Looking at the original configure.py I don't see any mention of pydbusmoddir and ModuleMetadata seems to be set like the patch suggests: 'QtWebKitWidgets': ModuleMetadata( qmake_QT=['webkitwidgets', 'printsupport']), It appears that we don't need the fix anymore. Reverts: d3ed0ab ('PyQt: fix build')

qtwebkit appears to be unsupported in Qt 5.11. We are using some old port https://github.com/NixOS/nixpkgs/blob/475d653afdbd8fe3e00ccfd22a30014b0df7aeaa/pkgs/development/libraries/qt-5/5.11/default.nix#L39-L48 and it is broken on darwin.

…eded

Fixes: d7ef9a7 ('python36Packages.qtconsole: 4.4.2 -> 4.4.3')

From the qutebrowser README: "support for QtWebKit will be dropped soon"

FRidh · 2018-12-27T23:17:10Z

Having two different version used by libraries is going to cause trouble. Looking at the changeset, they're the webkit one is only used in applications. It may still cause a collision there, but that is easily solvable by overriding the package set.

veprbl · 2018-12-28T04:24:36Z

It probably should be fine to just use a wrapProgram --prefix PYTHONPATH : on applications using pyqt5_with_webkit instead of relying on propagatedBuildInputs. In this case there is no harm if some pyqt5 app instead loads pyqt5_with_webkit by some chance.

@FRidh Or you know a better way?

FRidh · 2018-12-28T08:20:39Z

Introduce a pyqt5_without_qtwebkit attribute and set pyqt5 = pyqt5_without_qtwebkit;. Applications that require qtwebkit, but have dependencies that use pyqt5 without qtwebkit, can then override the Python package set.

Did you build all applications you've listed?

Actually, because there are no libraries depending on the qtwebkit version, that won't be necessary.

Upstream issue: Electron-Cash/Electron-Cash#1078

veprbl · 2018-12-30T04:21:12Z

@FRidh
Thanks for the tip with pyqt5_without_qtwebkit, that should help to avoid infinite recursion.

The problem I was talking about was when we do something like:

nix-shell -p qutebrowser -p frescobaldi --run frescobaldi

Then frescobaldi will fail to import QtWebKit because "setupHooks" will override PYTHONPATH with the wrong version of pyqt5. It should not be a problem when using nix-env though. I made an example workaround for frescobaldi, see my WIP commit. What do you think?

FRidh · 2018-12-30T08:44:34Z

@veprbl using nix-shell like that isn't "supported" anyway, so that's no problem.

veprbl · 2018-12-30T14:54:02Z

Then this should be ready.

FRidh · 2018-12-30T15:08:37Z

Note git-cola does not require Webkit. It only uses it to show shortcuts, and when the module is missing, it simply uses the default browser.

Looks good to me. I would like to remove the usage of the qt5webkit asap, e.g. by passing the non-webkit version forcing maintainers to fix their packages.

QtWebKit is only used if QtWebEngine is not available

veprbl requested a review from FRidh as a code owner December 10, 2018 21:27

veprbl mentioned this pull request Dec 10, 2018

python3.6-jupyter-1.0.0 fails to install on Mac #38840

Closed

GrahamcOfBorg added the 6.topic: python Python is a high-level, general-purpose programming language. label Dec 10, 2018

GrahamcOfBorg added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 11-100 This PR causes between 11 and 100 packages to rebuild on Linux. labels Dec 10, 2018

veprbl added the 6.topic: qt/kde Object-oriented framework for GUI creation label Dec 11, 2018

veprbl added the 2.status: work-in-progress label Dec 11, 2018

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch 3 times, most recently from d9d81e5 to 3fe8491 Compare December 11, 2018 17:40

GrahamcOfBorg added 8.has: package (new) This PR adds a new package and removed 6.topic: qt/kde Object-oriented framework for GUI creation labels Dec 11, 2018

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 6edeb89 to 2e48b0f Compare December 12, 2018 01:00

veprbl removed the 2.status: work-in-progress label Dec 14, 2018

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 2e48b0f to 80bb03a Compare December 20, 2018 21:48

GrahamcOfBorg added the 8.has: clean-up This PR removes packages or removes other cruft label Dec 20, 2018

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 80bb03a to 3c749ac Compare December 20, 2018 22:03

This was referenced Dec 21, 2018

qt59.qtwebkit: fix build on Darwin #50521

Merged

pythonPackages.pyqt5: fix sip dependency #52613

Merged

orivej approved these changes Dec 26, 2018

View reviewed changes

FRidh suggested changes Dec 26, 2018

View reviewed changes

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch 3 times, most recently from 6571ce9 to ebe5104 Compare December 26, 2018 16:46

veprbl added 7 commits December 27, 2018 09:13

pyqt5: refactor

3c19829

treewide: use pythonPackages.pyqt5_with_qtwebkit where QtWebKit is ne…

20d60c8

…eded

pythonPackages.qtconsole: build on darwin

97ec7a9

Fixes: d7ef9a7 ('python36Packages.qtconsole: 4.4.2 -> 4.4.3')

pyqt5_with_qtwebkit: add warning comment

07a6736

qutebrowser: drop QtWebKit support

8df467e

From the qutebrowser README: "support for QtWebKit will be dropped soon"

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 61bffea to 8df467e Compare December 27, 2018 14:14

FRidh self-assigned this Dec 27, 2018

FRidh approved these changes Dec 28, 2018

View reviewed changes

veprbl added 2 commits December 29, 2018 22:37

electron-cash: doesn't need QtWebKit

ae87977

Upstream issue: Electron-Cash/Electron-Cash#1078

frescobaldi: add explicit dependency on sip

16f11df

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from c32138b to 243be7e Compare December 30, 2018 04:19

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 243be7e to 16f11df Compare December 30, 2018 14:36

git-cola: doesn't need QtWebKit

eecc336

QtWebKit is only used if QtWebEngine is not available

veprbl force-pushed the pr/pyqt5_opt_qtwebkit branch from 149c752 to eecc336 Compare December 30, 2018 15:23

FRidh merged commit 26e5c0f into NixOS:master Dec 30, 2018

	# Community port of the now unmaintained upstream qtwebkit.
	qtwebkit = {
	src = fetchFromGitHub {
	owner = "annulen";
	repo = "webkit";
	rev = "4ce8ebc4094512b9916bfa5984065e95ac97c9d8";
	sha256 = "05h1xnxzbf7sp3plw5dndsvpf6iigh0bi4vlj4svx0hkf1giakjf";
	};
	version = "5.212-alpha-01-26-2018";
	};

Uh oh!

Conversation

veprbl commented Dec 10, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation for this change

Things done

Uh oh!

veprbl commented Dec 10, 2018

Uh oh!

veprbl commented Dec 11, 2018

Uh oh!

veprbl commented Dec 14, 2018

Uh oh!

veprbl commented Dec 20, 2018

Uh oh!

veprbl commented Dec 20, 2018

Uh oh!

FRidh left a comment

Choose a reason for hiding this comment

Uh oh!

FRidh Dec 26, 2018

Choose a reason for hiding this comment

Uh oh!

veprbl Dec 27, 2018

Choose a reason for hiding this comment

Uh oh!

FRidh commented Dec 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

veprbl commented Dec 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FRidh commented Dec 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

veprbl commented Dec 30, 2018

Uh oh!

FRidh commented Dec 30, 2018

Uh oh!

veprbl commented Dec 30, 2018

Uh oh!

FRidh commented Dec 30, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

veprbl commented Dec 10, 2018 •

edited

Loading

FRidh commented Dec 27, 2018 •

edited

Loading

veprbl commented Dec 28, 2018 •

edited

Loading

FRidh commented Dec 28, 2018 •

edited

Loading