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

Merge pull request #279367 from Stunkymonkey/sip4-normalize 

python311Packages.sip4: rename from sip_4
parents 214925a2 a69b0e8a

pkgs/applications/misc/openlp/lib.nix

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
# python deps

, python, buildPythonPackage

, alembic, beautifulsoup4, chardet, lxml, mako, pyenchant

, pyqt5-webkit, pyxdg, sip_4, sqlalchemy, sqlalchemy-migrate

, pyqt5-webkit, pyxdg, sip4, sqlalchemy, sqlalchemy-migrate

}:



buildPythonPackage rec {
@@ -41,7 +41,7 @@ buildPythonPackage rec { 
    pyenchant

    pyqt5-webkit

    pyxdg

    sip_4

    sip4

    sqlalchemy

    sqlalchemy-migrate

  ];

pkgs/applications/networking/gns3/gui.nix

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

    sentry-sdk

    setuptools

    sip_4 (pyqt5.override { withWebSockets = true; })

    sip4 (pyqt5.override { withWebSockets = true; })

    truststore

    qt5.qtwayland

  ] ++ lib.optionals (pythonOlder "3.9") [

pkgs/applications/science/machine-learning/labelimg/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
    propagatedBuildInputs = with python3Packages; [

      pyqt5

      lxml

      sip_4

      sip4

    ];

    preBuild = ''

      make qt5py3

pkgs/applications/video/openshot-qt/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { 
    pyqtwebengine

    pyzmq

    requests

    sip_4

    sip4

  ];



  strictDeps = true;

pkgs/development/python-modules/libarcus/default.nix

+2 −2
Original line number Diff line number Diff line 
{ lib, buildPythonPackage, python, fetchFromGitHub

, fetchpatch

, cmake, sip_4, protobuf, pythonOlder }:

, cmake, sip4, protobuf, pythonOlder }:



buildPythonPackage rec {

  pname = "libarcus";
@@ -25,7 +25,7 @@ buildPythonPackage rec { 


  disabled = pythonOlder "3.4";



  propagatedBuildInputs = [ sip_4 ];

  propagatedBuildInputs = [ sip4 ];

  nativeBuildInputs = [ cmake ];

  buildInputs = [ protobuf ];