diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 2cc0c588b111..6bc290809832 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ pyqt5 - pyqt5.pyqt5_sip + pyqt5_sip send2trash sphinx polib diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 93730fa664d5..c604e61a2c37 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -7,6 +7,7 @@ , lndir , dbus-python , sip +, pyqt5_sip , pyqt-builder , libsForQt5 , withConnectivity ? false @@ -16,21 +17,7 @@ , withLocation ? false }: -let - pyqt5_sip = buildPythonPackage rec { - pname = "PyQt5_sip"; - version = "12.9.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0cmfxb7igahxy74qkq199l6zdxrr75bnxris42fww3ibgjflir6k"; - }; - - # There is no test code and the check phase fails with: - # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory - doCheck = false; - }; -in buildPythonPackage rec { +buildPythonPackage rec { pname = "PyQt5"; version = "5.15.4"; format = "pyproject"; diff --git a/pkgs/development/python-modules/pyqt/sip.nix b/pkgs/development/python-modules/pyqt/sip.nix new file mode 100644 index 000000000000..aa29d9ad9d34 --- /dev/null +++ b/pkgs/development/python-modules/pyqt/sip.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "pyqt5-sip"; + version = "12.9.1"; + + src = fetchPypi { + pname = "PyQt5_sip"; + inherit version; + sha256 = "LyTymbRMURwjeWqvu7WBv96/eNCQVle3zuIUG0mCAw4="; + }; + + # There is no test code and the check phase fails with: + # > error: could not create 'PyQt5/sip.cpython-38-x86_64-linux-gnu.so': No such file or directory + doCheck = false; + pythonImportsCheck = ["PyQt5.sip"]; + + meta = with lib; { + description = "Python bindings for Qt5"; + homepage = "https://www.riverbankcomputing.com/software/sip/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ sander ]; + }; +} diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 934b357e692b..a7ee870a74a6 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -83,6 +83,7 @@ python3Packages.buildPythonApplication { dbus-python ] ++ lib.optionals withQt5 [ pyqt5 + pyqt5_sip enum-compat ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0c0506fe2b46..989fcc901e5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7359,6 +7359,8 @@ in { pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { }; + pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; };