nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
python311Packages.pyqt5-sip: rename from pyqt5_sip
This commit is contained in:
Felix Bühler 2024-01-14 13:11:06 +01:00 committed by GitHub
commit 214925a2d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/dupeguru/default.nix
View File

@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec {
pythonPath = with python3Packages; [
pyqt5
pyqt5_sip
pyqt5-sip
send2trash
sphinx
polib

2
pkgs/applications/misc/onthespot/default.nix
View File

@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication rec {
protobuf
pyogg
pyqt5
pyqt5_sip
pyqt5-sip
pyxdg
requests
setuptools

2
pkgs/applications/networking/firewalld/default.nix
View File

@ -26,7 +26,7 @@ let
pygobject3
] ++ lib.optionals withGui [
pyqt5
pyqt5_sip
pyqt5-sip
]);
in
stdenv.mkDerivation rec {

2
pkgs/applications/science/chemistry/pymol/default.nix
View File

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

8
pkgs/development/python-modules/pyqt/5.x.nix
View File

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

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

@ -87,7 +87,7 @@ python3Packages.buildPythonApplication {
distro
] ++ lib.optionals withQt5 [
pyqt5
pyqt5_sip
pyqt5-sip
enum-compat
];

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

@ -342,6 +342,7 @@ mapAliases ({
pymyq = python-myq; # added 2023-10-20
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_qtwebkit = pyqt5-webkit; # added 2024-01-07
pyramid_beaker = pyramid-beaker; # added 2023-08-23
pyramid_chameleon = pyramid-chameleon; # added 2023-08-23

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

@ -11011,7 +11011,7 @@ self: super: with self; {
pyqt5-stubs = callPackage ../development/python-modules/pyqt5-stubs { };
pyqt5_sip = callPackage ../development/python-modules/pyqt/sip.nix { };
pyqt5-sip = callPackage ../development/python-modules/pyqt/sip.nix { };
pyqt5_with_qtmultimedia = self.pyqt5.override {
withMultimedia = true;