diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-06-13 12:07:16 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-13 12:07:16 +0300 |
| commit | f20ce65f2ede043fb1ac9c6eba884f042054399d (patch) | |
| tree | 2e1fdbdacb5878b8cc01dfde525b4f4ceaac9454 /pkgs/development | |
| parent | 5dd562ab54835e6b9db56d6234772596579b4d37 (diff) | |
| parent | 9b4701455d57f9aa1ab466d8ed4323598592cb10 (diff) | |
| download | nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar.gz nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar.bz2 nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar.lz nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar.xz nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.tar.zst nixlib-f20ce65f2ede043fb1ac9c6eba884f042054399d.zip | |
Merge pull request #237355 from wineee/pyqt6
python3Packages.pyqt6: 6.5.0 -> 6.5.1
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/python-modules/pyqt/6.x.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index d24d3f362eb3..3edf1adf0284 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -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; { |