Unverified Commit 214925a2 authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #279395 from Stunkymonkey/pyqt5-sip-normalize 

python311Packages.pyqt5-sip: rename from pyqt5_sip
parents d535f2ec f5888649

pkgs/applications/misc/dupeguru/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { 


  pythonPath = with python3Packages; [

    pyqt5

    pyqt5_sip

    pyqt5-sip

    send2trash

    sphinx

    polib

pkgs/applications/misc/onthespot/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec { 
    protobuf

    pyogg

    pyqt5

    pyqt5_sip

    pyqt5-sip

    pyxdg

    requests

    setuptools

pkgs/applications/networking/firewalld/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ let 
    pygobject3

  ] ++ lib.optionals withGui [

    pyqt5

    pyqt5_sip

    pyqt5-sip

  ]);

in

stdenv.mkDerivation rec {

pkgs/applications/science/chemistry/pymol/default.nix

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

pkgs/development/python-modules/pyqt/5.x.nix

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