From 6f4d11dcc38280b86f082ddcb70d9425ef2f57d0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 16:03:01 +0100 Subject: python311Packages.pyqt5-webkit: rename from pyqt5_with_qtwebkit --- pkgs/applications/misc/openlp/lib.nix | 4 ++-- pkgs/applications/networking/instant-messengers/scudcloud/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index 045211c3af6a6..bf58f18fb3c32 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -5,7 +5,7 @@ # python deps , python, buildPythonPackage , alembic, beautifulsoup4, chardet, lxml, mako, pyenchant -, pyqt5_with_qtwebkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate +, pyqt5-webkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate }: buildPythonPackage rec { @@ -39,7 +39,7 @@ buildPythonPackage rec { lxml mako pyenchant - pyqt5_with_qtwebkit + pyqt5-webkit pyxdg sip_4 sqlalchemy diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 06eb5384abd22..6f85141f22fe7 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1ffdy74igll74fwpmnn3brvcxbk4iianqscdzz18sx1pfqpw16cl"; }; - propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; + propagatedBuildInputs = with python3Packages; [ pyqt5-webkit dbus-python jsmin ]; meta = with lib; { description = "Non-official desktop client for Slack"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 86f10c04908ec..283077d5bd006 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -335,6 +335,7 @@ mapAliases ({ pymyq = python-myq; # added 2023-10-20 python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07 pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09 + pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07 pyramid_beaker = pyramid-beaker; # added 2023-08-23 pyramid_chameleon = pyramid-chameleon; # added 2023-08-23 pyramid_exclog = pyramid-exclog; # added 2023-08-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 73ace0d799d5e..0bcb1210d2947 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10982,11 +10982,11 @@ self: super: with self; { }; /* - `pyqt5_with_qtwebkit` should not be used by python libraries in + `pyqt5-webkit` should not be used by python libraries in pkgs/development/python-modules/*. Putting this attribute in `propagatedBuildInputs` may cause collisions. */ - pyqt5_with_qtwebkit = self.pyqt5.override { + pyqt5-webkit = self.pyqt5.override { withWebKit = true; }; -- cgit 1.4.1