diff options
Diffstat (limited to 'pkgs/development/python-modules')
7 files changed, 103 insertions, 53 deletions
diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 17c25f74b7658..631e0b6eaad38 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.4.0"; + version = "1.5.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-viJOrmvrooHh47yyJJomOGBhQvcoWM3jKMRwZ+6/UJ8="; + hash = "sha256-//e+Kb85TBAC9/mHz/T/Dm/pNjbj0488/L/NeS1RMqY="; }; postPatch = '' diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix index 0e6a156a4a9e9..725953f0726c7 100644 --- a/pkgs/development/python-modules/nbxmpp/default.nix +++ b/pkgs/development/python-modules/nbxmpp/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "nbxmpp"; - version = "3.2.2"; + version = "3.2.4"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "gajim"; repo = "python-nbxmpp"; rev = version; - sha256 = "sha256-WVE8evbfWdQNsuDEQF7WfEYDQEKGKXElKQBkUn7bJ1I="; + sha256 = "sha256-ydOJBgKPkmw2Qf0TB3ukWGpi8P0BgcCGA47dASjRrgQ="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pyqt-builder/default.nix b/pkgs/development/python-modules/pyqt-builder/default.nix index 5e87e700a55f6..1aef6e13d2c75 100644 --- a/pkgs/development/python-modules/pyqt-builder/default.nix +++ b/pkgs/development/python-modules/pyqt-builder/default.nix @@ -2,20 +2,14 @@ buildPythonPackage rec { pname = "pyqt-builder"; - version = "1.13.0"; + version = "1.14.0"; src = fetchPypi { pname = "PyQt-builder"; inherit version; - sha256 = "sha256-SHdYDDjOtTIOEps4HQg7CoYBxoFm2LmXB/CPoKFonu8="; + sha256 = "sha256-Z1WTHG0viUBVPgM00QyTPOXMGLZEJelP2hrM9P93T1k="; }; - patches = [ - # use the sip-distinfo executable from PATH instead of trying to guess, - # we know it's the right one because it's the _only_ one - ./use-sip-distinfo-from-path.patch - ]; - propagatedBuildInputs = [ packaging sip ]; pythonImportsCheck = [ "pyqtbuild" ]; @@ -27,6 +21,6 @@ buildPythonPackage rec { description = "PEP 517 compliant build system for PyQt"; homepage = "https://pypi.org/project/PyQt-builder/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nrdxp ]; }; } diff --git a/pkgs/development/python-modules/pyqt6-webengine.nix b/pkgs/development/python-modules/pyqt6-webengine.nix new file mode 100644 index 0000000000000..96fa057a47cae --- /dev/null +++ b/pkgs/development/python-modules/pyqt6-webengine.nix @@ -0,0 +1,89 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pkg-config +, lndir +, sip +, pyqt-builder +, qt6Packages +, pythonOlder +, pyqt6 +, python +}: + +buildPythonPackage rec { + pname = "PyQt6_WebEngine"; + version = "6.4.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-THHBMIYKvNEeBMr7IuM5g/qaOu6DI8UZCbFaFwGCjiE="; + }; + + # fix include path and increase verbosity + postPatch = '' + sed -i \ + '/\[tool.sip.project\]/a\ + verbose = true\ + sip-include-dirs = [\"${pyqt6}/${python.sitePackages}/PyQt6/bindings\"]' \ + pyproject.toml + ''; + + enableParallelBuilding = true; + # HACK: paralellize compilation of make calls within pyqt's setup.py + # pkgs/stdenv/generic/setup.sh doesn't set this for us because + # make gets called by python code and not its build phase + # format=pyproject means the pip-build-hook hook gets used to build this project + # pkgs/development/interpreters/python/hooks/pip-build-hook.sh + # does not use the enableParallelBuilding flag + postUnpack = '' + export MAKEFLAGS+=" -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES" + ''; + + outputs = [ "out" "dev" ]; + + dontWrapQtApps = true; + + nativeBuildInputs = with qt6Packages; [ + pkg-config + lndir + sip + qtwebengine + qmake + pyqt-builder + ]; + + buildInputs = with qt6Packages; [ + qtwebengine + ]; + + propagatedBuildInputs = [ + pyqt6 + ]; + + passthru = { + inherit sip; + }; + + dontConfigure = true; + + # Checked using pythonImportsCheck, has no tests + doCheck = true; + + pythonImportsCheck = [ + "PyQt6.QtWebEngineCore" + "PyQt6.QtWebEngineQuick" + "PyQt6.QtWebEngineWidgets" + ]; + + meta = with lib; { + description = "Python bindings for Qt6 WebEngine"; + homepage = "https://riverbankcomputing.com/"; + license = licenses.gpl3Only; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ LunNova nrdxp ]; + }; +} diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index 68052145766c3..ab2701fefdc33 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -2,35 +2,19 @@ buildPythonPackage rec { pname = "sip"; - version = "6.6.2"; + version = "6.7.1"; src = fetchPypi { pname = "sip"; inherit version; - sha256 = "sha256-Dj76wcXf2OUlrlcUCSffJpk+E/WLidFXfDFPQQW/2Q0="; + sha256 = "sha256-KBcP34gPk3Am/If6qcF3sGLDU8XRaeoyQrB4AmFN3Qw="; }; - patches = [ - # on non-x86 Linux platforms, sip incorrectly detects the manylinux version - # and PIP will refuse to install the resulting wheel. - # remove once upstream fixes this, hopefully in 6.5.2 - ./fix-manylinux-version.patch - - # fix issue triggered by QGIS 3.26.x, already fixed upstream - # in SIP, waiting for release past 6.6.2 - (fetchpatch { - url = "https://riverbankcomputing.com/hg/sip/raw-diff/323d39a2d602/sipbuild/generator/parser/instantiations.py"; - hash = "sha256-QEQuRzXA+wK9Dt22U/LgIwtherY9pJURGJYpKpJkiok="; - }) - ]; - propagatedBuildInputs = [ packaging ply toml ]; # There aren't tests doCheck = false; - pythonImportsCheck = [ "sipbuild" ]; - # FIXME: Why isn't this detected automatically? # Needs to be specified in pyproject.toml, e.g.: # [tool.sip.bindings.MODULE] @@ -45,10 +29,12 @@ buildPythonPackage rec { else throw "unsupported platform"; + pythonImportsCheck = [ "sipbuild" ]; + meta = with lib; { description = "Creates C++ bindings for Python modules"; homepage = "https://riverbankcomputing.com/"; license = licenses.gpl3Only; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ nrdxp ]; }; } diff --git a/pkgs/development/python-modules/sip/fix-manylinux-version.patch b/pkgs/development/python-modules/sip/fix-manylinux-version.patch deleted file mode 100644 index 4b8e99ae8e472..0000000000000 --- a/pkgs/development/python-modules/sip/fix-manylinux-version.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/sipbuild/project.py b/sipbuild/project.py ---- a/sipbuild/project.py -+++ b/sipbuild/project.py -@@ -336,13 +336,13 @@ class Project(AbstractProject, Configurable): - # We expect a two part tag so leave anything else unchanged. - parts = platform_tag.split('-') - if len(parts) == 2: -- if self.minimum_glibc_version > (2, 17): -+ if self.minimum_glibc_version > (2, 17) or parts[1] not in {"x86_64", "i686", "aarch64", "armv7l", "ppc64", "ppc64le", "s390x"}: - # PEP 600. - parts[0] = 'manylinux' - parts.insert(1, - '{}.{}'.format(self.minimum_glibc_version[0], - self.minimum_glibc_version[1])) -- elif self.minimum_glibc_version > (2, 12): -+ elif self.minimum_glibc_version > (2, 12) or parts[1] not in {"x86_64", "i686"}: - # PEP 599. - parts[0] = 'manylinux2014' - elif self.minimum_glibc_version > (2, 5): diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index b9454f9ad097d..5bd7d15d11219 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "timetagger"; - version = "22.6.6"; + version = "22.9.3"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-2qPtC8gsRw9ZOkl+H8euTwTrPVAB0cdfFflhbLqXz/I="; + sha256 = "sha256-9YmO0nD6QSFMSXsWlfbRxNWW1nwe7WXinC9pLe7rDEY="; }; propagatedBuildInputs = [ |