colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #279367 from Stunkymonkey/sip4-normalize

Browse Source 
python311Packages.sip4: rename from sip_4
This commit is contained in:
Felix Bühler 2024-01-14 13:16:56 +01:00 committed by GitHub
commit e0fe5361fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/misc/openlp/lib.nix
View File

@ -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
];

2
pkgs/applications/networking/gns3/gui.nix
View File

@ -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") [

2
pkgs/applications/science/machine-learning/labelimg/default.nix
View File

@ -15,7 +15,7 @@
propagatedBuildInputs = with python3Packages; [
pyqt5
lxml
sip_4
sip4
];
preBuild = ''
make qt5py3

2
pkgs/applications/video/openshot-qt/default.nix
View File

@ -41,7 +41,7 @@ mkDerivationWith python3.pkgs.buildPythonApplication {
pyqtwebengine
pyzmq
requests
sip_4
sip4
];
strictDeps = true;

4
pkgs/development/python-modules/libarcus/default.nix
View File

@ -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 ];

4
pkgs/development/python-modules/libsavitar/default.nix
View File

@ -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";

4
pkgs/development/python-modules/pynest2d/default.nix
View File

@ -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}";

2
pkgs/misc/drivers/hplip/default.nix
View File

@ -82,7 +82,7 @@ python3Packages.buildPythonApplication {
pygobject3
reportlab
usbutils
sip_4
sip4
dbus-python
distro
] ++ lib.optionals withQt5 [

2
pkgs/misc/frescobaldi/default.nix
View File

@ -16,7 +16,7 @@ buildPythonApplication rec {
lilypond
pygame
python-ly
sip_4
sip4
pyqt5
poppler-qt5
pyqtwebengine

1
pkgs/top-level/python-aliases.nix
View File

@ -446,6 +446,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

2
pkgs/top-level/python-packages.nix
View File

@ -13240,7 +13240,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 { };