python311Packages.pyqt5-webkit: rename from pyqt5_with_qtwebkit

This commit is contained in:
Felix Buehler 2024-01-07 16:03:01 +01:00
parent 5570f4ba1e
commit 6f4d11dcc3
4 changed files with 6 additions and 5 deletions

View File

@ -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

View File

@ -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";

View File

@ -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

View File

@ -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;
};