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

python311Packages.pyqt5-webkit: rename from pyqt5_with_qtwebkit #279392

Merged
merged 1 commit into from
Jan 9, 2024
Merged

python311Packages.pyqt5-webkit: rename from pyqt5_with_qtwebkit #279392

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
4 changes: 2 additions & 2 deletions pkgs/applications/misc/openlp/lib.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -39,7 +39,7 @@ buildPythonPackage rec {
lxml
mako
pyenchant
pyqt5_with_qtwebkit
pyqt5-webkit
pyxdg
sip_4
sqlalchemy
Expand Down
2 changes: 1 addition & 1 deletion pkgs/applications/networking/instant-messengers/scudcloud/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/python-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};

Expand Down