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

qutebrowser: use qt515 #97586

Merged
1 commit merged into from Sep 10, 2020
Merged

qutebrowser: use qt515 #97586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22773,7 +22773,12 @@ in

quodlibet-xine-full = quodlibet-full.override { xineBackend = true; tag = "-xine-full"; };

qutebrowser = libsForQt514.callPackage ../applications/networking/browsers/qutebrowser { };
qutebrowser = libsForQt515.callPackage ../applications/networking/browsers/qutebrowser {
python3Packages = python3Packages.override {
qt5 = qt515;
libsForQt5 = libsForQt515;
};
};

rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

Expand Down
7 changes: 2 additions & 5 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@
{ pkgs
, stdenv
, python
, qt5
Copy link
Member

Choose a reason for hiding this comment

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

Adding arguments to python-packages.nix is also not the way to go.

, libsForQt5
Copy link
Member

Choose a reason for hiding this comment

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

It looks like this updated all of python-packages to qt515 - I had to update inkcut to 515 to reflect this (#97971).

It's possible that more of the changes in 22167ae can now be rolled back, but I tried a few and they don't seem to have the same problem inkcut had.

Copy link
Author

Choose a reason for hiding this comment

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

That was not intended. Is it feasible to fix all python packages that were broken by this or should we change the python packages back to use Qt 5.14, while using pyqtwebengine with Qt 5.15 only for qutebrowser?

Copy link
Member

Choose a reason for hiding this comment

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

I don't know, I tried a bunch of them and they all seemed fine (except for inkcut).

Personally I like the change and think we should fix any packages that might have been broken by this, but I guess it's hard to find out which are?

Copy link
Member

Choose a reason for hiding this comment

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

Found this just now, maestral-gui is affected (#98067). Not sure what the correct fix for this is?

, overrides ? (self: super: {})
}:

with pkgs.lib;

let
qt5 = pkgs.qt514;
libsForQt5 = pkgs.libsForQt514;
in

let
packages = ( self:

Expand Down