diff options
-rw-r--r-- | pkgs/applications/misc/dupeguru/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/misc/onthespot/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/firewalld/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/chemistry/pymol/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 8 | ||||
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 2 | ||||
-rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
8 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 36fa71b1d9c71..4613f86ea0e25 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_sip + pyqt5-sip send2trash sphinx polib diff --git a/pkgs/applications/misc/onthespot/default.nix b/pkgs/applications/misc/onthespot/default.nix index 2a37f90d3bf30..75ae769d33ff7 100644 --- a/pkgs/applications/misc/onthespot/default.nix +++ b/pkgs/applications/misc/onthespot/default.nix @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { protobuf pyogg pyqt5 - pyqt5_sip + pyqt5-sip pyxdg requests setuptools diff --git a/pkgs/applications/networking/firewalld/default.nix b/pkgs/applications/networking/firewalld/default.nix index 0af5c0c9caacc..c96ca72fdfa33 100644 --- a/pkgs/applications/networking/firewalld/default.nix +++ b/pkgs/applications/networking/firewalld/default.nix @@ -26,7 +26,7 @@ let pygobject3 ] ++ lib.optionals withGui [ pyqt5 - pyqt5_sip + pyqt5-sip ]); in stdenv.mkDerivation rec { diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix index 155d521549e3b..553e82eed8fb4 100644 --- a/pkgs/applications/science/chemistry/pymol/default.nix +++ b/pkgs/applications/science/chemistry/pymol/default.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { postInstall = with python3Packages; '' wrapProgram $out/bin/pymol \ - --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5_sip ]} + --prefix PYTHONPATH : ${lib.makeSearchPathOutput "lib" python3.sitePackages [ pyqt5 pyqt5.pyqt5-sip ]} mkdir -p "$out/share/icons/" ln -s ../../lib/python/pymol/pymol_path/data/pymol/icons/icon2.svg "$out/share/icons/pymol.svg" diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index c514b9f835843..0b2b1c8ad6b18 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -9,7 +9,7 @@ , lndir , dbus-python , sip -, pyqt5_sip +, pyqt5-sip , pyqt-builder , libsForQt5 , enableVerbose ? true @@ -41,7 +41,7 @@ buildPythonPackage rec { # Fix some wrong assumptions by ./project.py # TODO: figure out how to send this upstream ./pyqt5-fix-dbus-mainloop-support.patch - # confirm license when installing via pyqt5_sip + # confirm license when installing via pyqt5-sip ./pyqt5-confirm-license.patch ]; @@ -158,11 +158,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ dbus-python - pyqt5_sip + pyqt5-sip ]; passthru = { - inherit sip pyqt5_sip; + inherit sip pyqt5-sip; multimediaEnabled = withMultimedia; webKitEnabled = withWebKit; WebSocketsEnabled = withWebSockets; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 577cb3ecf8e33..eb221483d5bc2 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -87,7 +87,7 @@ python3Packages.buildPythonApplication { distro ] ++ lib.optionals withQt5 [ pyqt5 - pyqt5_sip + pyqt5-sip enum-compat ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fcc3497480b05..eae0dc5bf906f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -341,6 +341,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_sip = pyqt5-sip; # added 2024-01-07 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 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c07c5c5a509..d3611645ad176 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10985,7 +10985,7 @@ self: super: with self; { pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { }; - pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { }; + pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { }; pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; |