Unverified Commit 77be1fdf authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #279394 from Stunkymonkey/pyqt5-multimedia-normalize 

python311Packages.pyqt5-multimedia: rename from pyqt5_with_qtmultimedia
parents 11a146b9 4cf5b993

pkgs/applications/audio/picard/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ let 
  pythonPackages = python3Packages;

  pyqt5 =

    if enablePlayback then

      pythonPackages.pyqt5_with_qtmultimedia

      pythonPackages.pyqt5-multimedia

    else

      pythonPackages.pyqt5;

in

pkgs/applications/video/qarte/default.nix

+1 −1
Original line number Diff line number Diff line 
{ 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";

pkgs/top-level/python-aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/python-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;















  };