Merge pull request #237355 from wineee/pyqt6

python3Packages.pyqt6: 6.5.0 -> 6.5.1
This commit is contained in:
Weijia Wang 2023-06-13 12:07:16 +03:00 committed by GitHub
commit f20ce65f2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,7 +1,6 @@
{ lib
, stdenv
, buildPythonPackage
, isPy27
, fetchPypi
, pkg-config
, dbus
@ -15,9 +14,7 @@
, pythonOlder
, withMultimedia ? true
, withWebSockets ? true
# FIXME: Once QtLocation is available for Qt6 enable this
# https://bugreports.qt.io/browse/QTBUG-96795
#, withLocation ? true
, withLocation ? true
# Not currently part of PyQt6
#, withConnectivity ? true
, withPrintSupport ? true
@ -26,14 +23,14 @@
buildPythonPackage rec {
pname = "PyQt6";
version = "6.5.0";
version = "6.5.1";
format = "pyproject";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
hash = "sha256-uXy0vpssiZeQTqZozzsKSuWCIZb3eSWQ0F7N5iFqn7w=";
hash = "sha256-4WagVownvMjbACcaUEOTYiZpC2pKdM4KXK60CAQKl8M=";
};
patches = [
@ -83,7 +80,7 @@ buildPythonPackage rec {
# ++ lib.optional withConnectivity qtconnectivity
++ lib.optional withMultimedia qtmultimedia
++ lib.optional withWebSockets qtwebsockets
# ++ lib.optional withLocation qtlocation
++ lib.optional withLocation qtlocation
;
buildInputs = with qt6Packages; [
@ -97,7 +94,7 @@ buildPythonPackage rec {
]
# ++ lib.optional withConnectivity qtconnectivity
++ lib.optional withWebSockets qtwebsockets
# ++ lib.optional withLocation qtlocation
++ lib.optional withLocation qtlocation
;
propagatedBuildInputs = [
@ -132,7 +129,7 @@ buildPythonPackage rec {
++ lib.optional withWebSockets "PyQt6.QtWebSockets"
++ lib.optional withMultimedia "PyQt6.QtMultimedia"
# ++ lib.optional withConnectivity "PyQt6.QtConnectivity"
# ++ lib.optional withLocation "PyQt6.QtPositioning"
++ lib.optional withLocation "PyQt6.QtPositioning"
;
meta = with lib; {