diff options
| author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2024-01-18 23:54:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-18 23:54:30 +0100 |
| commit | 77be1fdf7dfae372033669a0e6e73064639549bf (patch) | |
| tree | 99e0ad683c546439130619442e338830f934f75d | |
| parent | 11a146b96c65eec5b53b2d9951ad3c04cc3a38e0 (diff) | |
| parent | 4cf5b993ba046b1587ae7ac552ba990a62c9f9b0 (diff) | |
Merge pull request #279394 from Stunkymonkey/pyqt5-multimedia-normalize
python311Packages.pyqt5-multimedia: rename from pyqt5_with_qtmultimedia
| -rw-r--r-- | pkgs/applications/audio/picard/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/qarte/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-aliases.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 4ae4ff6b6794c..065018448364f 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -14,7 +14,7 @@ let pythonPackages = python3Packages; pyqt5 = if enablePlayback then - pythonPackages.pyqt5_with_qtmultimedia + pythonPackages.pyqt5-multimedia else pythonPackages.pyqt5; in diff --git a/pkgs/applications/video/qarte/default.nix b/pkgs/applications/video/qarte/default.nix index e237a1c641a92..cbbf1f3076201 100644 --- a/pkgs/applications/video/qarte/default.nix +++ b/pkgs/applications/video/qarte/default.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, fetchbzr, python3, rtmpdump }: let - pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5_with_qtmultimedia ]); + pythonEnv = python3.withPackages (ps: with ps; [ m3u8 pyqt5-multimedia ]); in mkDerivation { pname = "qarte"; version = "5.5.0"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index e2baccf5192b8..9c167009a8dda 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -345,6 +345,7 @@ mapAliases ({ 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_qtmultimedia = pyqt5-multimedia; # 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 173d4da103b5b..cbbe4a9074f15 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11029,7 +11029,7 @@ self: super: with self; { pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { }; - pyqt5_with_qtmultimedia = self.pyqt5.override { + pyqt5-multimedia = self.pyqt5.override { withMultimedia = true; }; |