From a69b0e8a684916ba0dc9606048518e9753a7888d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 7 Jan 2024 14:11:10 +0100 Subject: [PATCH] python311Packages.sip4: rename from sip_4 --- pkgs/applications/misc/openlp/lib.nix | 4 ++-- pkgs/applications/networking/gns3/gui.nix | 2 +- .../science/machine-learning/labelimg/default.nix | 2 +- pkgs/applications/video/openshot-qt/default.nix | 2 +- pkgs/development/python-modules/libarcus/default.nix | 4 ++-- pkgs/development/python-modules/libsavitar/default.nix | 4 ++-- pkgs/development/python-modules/pynest2d/default.nix | 4 ++-- pkgs/misc/drivers/hplip/default.nix | 2 +- pkgs/misc/frescobaldi/default.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 11 files changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/openlp/lib.nix b/pkgs/applications/misc/openlp/lib.nix index bf58f18fb3c3..ea22f54ac022 100644 --- a/pkgs/applications/misc/openlp/lib.nix +++ b/pkgs/applications/misc/openlp/lib.nix @@ -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 ]; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 67a60559d99d..218334bbd92f 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -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") [ diff --git a/pkgs/applications/science/machine-learning/labelimg/default.nix b/pkgs/applications/science/machine-learning/labelimg/default.nix index 620ccfb084ef..23703ed09952 100644 --- a/pkgs/applications/science/machine-learning/labelimg/default.nix +++ b/pkgs/applications/science/machine-learning/labelimg/default.nix @@ -15,7 +15,7 @@ propagatedBuildInputs = with python3Packages; [ pyqt5 lxml - sip_4 + sip4 ]; preBuild = '' make qt5py3 diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 5c9b85e1f680..089b60a3b27c 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -41,7 +41,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication { pyqtwebengine pyzmq requests - sip_4 + sip4 ]; strictDeps = true; diff --git a/pkgs/development/python-modules/libarcus/default.nix b/pkgs/development/python-modules/libarcus/default.nix index 0230e68007de..b95c2b295257 100644 --- a/pkgs/development/python-modules/libarcus/default.nix +++ b/pkgs/development/python-modules/libarcus/default.nix @@ -1,6 +1,6 @@ { 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 ]; diff --git a/pkgs/development/python-modules/libsavitar/default.nix b/pkgs/development/python-modules/libsavitar/default.nix index 83b3e129ea39..56ce67110b90 100644 --- a/pkgs/development/python-modules/libsavitar/default.nix +++ b/pkgs/development/python-modules/libsavitar/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip_4 }: +{ lib, buildPythonPackage, python, pythonOlder, fetchFromGitHub, cmake, sip4 }: buildPythonPackage rec { pname = "libsavitar"; @@ -18,7 +18,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cmake ]; - propagatedBuildInputs = [ sip_4 ]; + propagatedBuildInputs = [ sip4 ]; disabled = pythonOlder "3.4.0"; diff --git a/pkgs/development/python-modules/pynest2d/default.nix b/pkgs/development/python-modules/pynest2d/default.nix index 694459bf0050..a3b1929feb44 100644 --- a/pkgs/development/python-modules/pynest2d/default.nix +++ b/pkgs/development/python-modules/pynest2d/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, python, cmake -, libnest2d, sip_4, clipper }: +, libnest2d, sip4, clipper }: buildPythonPackage rec { version = "4.12.0"; @@ -13,7 +13,7 @@ buildPythonPackage rec { hash = "sha256-QQdTDhO4i9NVhegGTmdEQSNv3gooaZzTX/Rv86h3GEo="; }; - propagatedBuildInputs = [ libnest2d sip_4 clipper ]; + propagatedBuildInputs = [ libnest2d sip4 clipper ]; nativeBuildInputs = [ cmake ]; CLIPPER_PATH = "${clipper.out}"; diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 577cb3ecf8e3..6ee4514cc5e1 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -82,7 +82,7 @@ python3Packages.buildPythonApplication { pygobject3 reportlab usbutils - sip_4 + sip4 dbus-python distro ] ++ lib.optionals withQt5 [ diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix index 2c49c5779752..32bf18af1940 100644 --- a/pkgs/misc/frescobaldi/default.nix +++ b/pkgs/misc/frescobaldi/default.nix @@ -16,7 +16,7 @@ buildPythonApplication rec { lilypond pygame python-ly - sip_4 + sip4 pyqt5 poppler-qt5 pyqtwebengine diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index fcc3497480b0..60d0b69f60f0 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -443,6 +443,7 @@ mapAliases ({ setuptools_scm = setuptools-scm; # added 2021-06-03 setuptoolsTrial = setuptools-trial; # added 2023-11-11 sharkiqpy = sharkiq; # added 2022-05-21 + sip_4 = sip4; # added 2024-01-07 ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09 smart_open = smart-open; # added 2021-03-14 smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 35c07c5c5a50..548dcff87fb2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13210,7 +13210,7 @@ self: super: with self; { sip = callPackage ../development/python-modules/sip { }; - sip_4 = callPackage ../development/python-modules/sip/4.x.nix { }; + sip4 = callPackage ../development/python-modules/sip/4.x.nix { }; sipyco = callPackage ../development/python-modules/sipyco { };