From 3f52371a7cd2d439b3792a24ecbcf35b854a262f Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Dec 2024 17:06:48 -0500 Subject: [PATCH 1/5] python312Packages.sip: 6.9.0 -> 6.9.1 --- pkgs/development/python-modules/sip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sip/default.nix b/pkgs/development/python-modules/sip/default.nix index c0a828ab39c8..bf83c5c8c142 100644 --- a/pkgs/development/python-modules/sip/default.nix +++ b/pkgs/development/python-modules/sip/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "sip"; - version = "6.9.0"; + version = "6.9.1"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-CT/Q4V2Zri+Kg91/fbqj/yUMWCp3644IRc2aytsfCTQ="; + hash = "sha256-eQS+UZDXh5lSVjt4o68OWPon2VJa9/U/k+rHqDtDPns="; }; build-system = [ From f16215f428e024deb1ea0976771b4f3ff40de175 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 4 Nov 2024 14:01:54 -0500 Subject: [PATCH 2/5] python312Packages.pyqt6: 6.8.0.dev2410141303 -> 6.8.0 --- pkgs/development/python-modules/pyqt/6.x.nix | 41 ++++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index b1bf34abd489..a44e8b89dfa9 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -2,11 +2,10 @@ lib, stdenv, buildPythonPackage, - fetchurl, + fetchPypi, pkg-config, dbus, lndir, - setuptools, dbus-python, sip, pyqt6-sip, @@ -25,15 +24,15 @@ buildPythonPackage rec { pname = "pyqt6"; - version = "6.8.0.dev2410141303"; - format = "pyproject"; + version = "6.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; - # This is dangerous, how can we get web archive to archive the URL? - src = fetchurl { - url = "https://riverbankcomputing.com/pypi/packages/PyQt6/PyQt6-${version}.tar.gz"; - hash = "sha256-eHYqj22us07uFkErJD2d0y0wueZxtQTwTFW9cI7yoK4="; + src = fetchPypi { + pname = "PyQt6"; + inherit version; + hash = "sha256-bYYo3kwqBQ8LdEYuTJy5f4Ob9v+rvKkXEXIv+ygVcNk="; }; patches = [ @@ -45,6 +44,16 @@ buildPythonPackage rec { ./pyqt5-confirm-license.patch ]; + build-system = [ + sip + pyqt-builder + ]; + + dependencies = [ + pyqt6-sip + dbus-python + ]; + # be more verbose # and normalize version postPatch = '' @@ -53,11 +62,8 @@ buildPythonPackage rec { verbose = true EOF - # pythonRelaxDeps doesn't work and the wanted versions are not released AFAIK substituteInPlace pyproject.toml \ - --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' \ - --replace-fail "sip >=6.9, <7" "sip >=6.8.6, <7" \ - --replace-fail 'PyQt-builder >=1.17, <2' "PyQt-builder >=1.16, <2" + --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' ''; enableParallelBuilding = true; @@ -83,7 +89,6 @@ buildPythonPackage rec { [ pkg-config lndir - sip qtbase qtsvg qtdeclarative @@ -104,7 +109,6 @@ buildPythonPackage rec { qtbase qtsvg qtdeclarative - pyqt-builder qtquick3d qtquicktimeline ] @@ -113,13 +117,8 @@ buildPythonPackage rec { ++ lib.optional withLocation qtlocation; propagatedBuildInputs = - [ - dbus-python - pyqt6-sip - setuptools - ] # ld: library not found for -lcups - ++ lib.optionals (withPrintSupport && stdenv.hostPlatform.isDarwin) [ cups ]; + lib.optionals (withPrintSupport && stdenv.hostPlatform.isDarwin) [ cups ]; passthru = { inherit sip pyqt6-sip; From 3dc4475ebbaa4eb0983b7f612ff282140ab6d041 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Dec 2024 17:09:05 -0500 Subject: [PATCH 3/5] python312Packages.pyqt6-charts: 6.7.0 -> 6.8.0 --- .../python-modules/pyqt6-charts/default.nix | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/pyqt6-charts/default.nix b/pkgs/development/python-modules/pyqt6-charts/default.nix index 0ab27728f7af..b50651cfcc2b 100644 --- a/pkgs/development/python-modules/pyqt6-charts/default.nix +++ b/pkgs/development/python-modules/pyqt6-charts/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "pyqt6-charts"; - version = "6.7.0"; - format = "pyproject"; + version = "6.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "PyQt6_Charts"; inherit version; - hash = "sha256-xPfPNpko978DLk4z9xjTuP5m2hdtSVn+MHNalw2G81w="; + hash = "sha256-+GcFuHQOMEFmfOIRrqogW3UOtrr0yQj04/bcjHINEPE="; }; # fix include path and increase verbosity @@ -46,16 +46,21 @@ buildPythonPackage rec { dontWrapQtApps = true; - nativeBuildInputs = with qt6Packages; [ - qtcharts + build-system = [ sip - qmake pyqt-builder ]; - buildInputs = with qt6Packages; [ qtcharts ]; + dependencies = [ + pyqt6 + ]; - propagatedBuildInputs = [ pyqt6 ]; + nativeBuildInputs = with qt6Packages; [ + qtcharts + qmake + ]; + + buildInputs = with qt6Packages; [ qtcharts ]; dontConfigure = true; @@ -64,11 +69,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "PyQt6.QtCharts" ]; - meta = with lib; { + meta = { description = "Python bindings for Qt6 QtCharts"; homepage = "https://riverbankcomputing.com/"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; inherit (mesa.meta) platforms; - maintainers = with maintainers; [ dandellion ]; + maintainers = with lib.maintainers; [ dandellion ]; }; } From f831c075dd5002c5534d7b4cc85822061fbceb05 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Dec 2024 17:12:10 -0500 Subject: [PATCH 4/5] python312Packages.pyqt6-webengine: 6.7.0 -> 6.8.0 --- .../pyqt6-webengine/default.nix | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index 59a2a1eeab86..be38e6c78f35 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -15,15 +15,15 @@ buildPythonPackage rec { pname = "pyqt6-webengine"; - version = "6.7.0"; - format = "pyproject"; + version = "6.8.0"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchPypi { pname = "PyQt6_WebEngine"; inherit version; - hash = "sha256-aO3HrbbZ4nX13pVogeecyg1x+tQ5q+qhDYI7/1rFUAE="; + hash = "sha256-ZARepiK2pBiCwrGPVa6XFLhmCs/walTpEOtygiwvP/I="; }; # fix include path and increase verbosity @@ -53,18 +53,23 @@ buildPythonPackage rec { dontWrapQtApps = true; - nativeBuildInputs = with qt6Packages; [ - pkg-config - lndir + build-system = [ sip - qtwebengine - qmake pyqt-builder ]; - buildInputs = with qt6Packages; [ qtwebengine ]; + dependencies = [ + pyqt6 + ]; - propagatedBuildInputs = [ pyqt6 ]; + nativeBuildInputs = with qt6Packages; [ + pkg-config + lndir + qtwebengine + qmake + ]; + + buildInputs = with qt6Packages; [ qtwebengine ]; passthru = { inherit sip; @@ -80,12 +85,12 @@ buildPythonPackage rec { "PyQt6.QtWebEngineWidgets" ]; - meta = with lib; { + meta = { description = "Python bindings for Qt6 WebEngine"; homepage = "https://riverbankcomputing.com/"; - license = licenses.gpl3Only; + license = lib.licenses.gpl3Only; inherit (mesa.meta) platforms; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ LunNova nrdxp ]; From 98fd5e4540f083b92e385db1cb16cdfdad2443eb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Dec 2024 20:22:49 -0500 Subject: [PATCH 5/5] python312Packages.pyqt6-webengine: add patch fixing missing include --- .../python-modules/pyqt6-webengine/default.nix | 4 ++++ .../python-modules/pyqt6-webengine/qvariant.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/pyqt6-webengine/qvariant.patch diff --git a/pkgs/development/python-modules/pyqt6-webengine/default.nix b/pkgs/development/python-modules/pyqt6-webengine/default.nix index be38e6c78f35..4f410a23626f 100644 --- a/pkgs/development/python-modules/pyqt6-webengine/default.nix +++ b/pkgs/development/python-modules/pyqt6-webengine/default.nix @@ -26,6 +26,10 @@ buildPythonPackage rec { hash = "sha256-ZARepiK2pBiCwrGPVa6XFLhmCs/walTpEOtygiwvP/I="; }; + patches = [ + ./qvariant.patch + ]; + # fix include path and increase verbosity postPatch = '' sed -i \ diff --git a/pkgs/development/python-modules/pyqt6-webengine/qvariant.patch b/pkgs/development/python-modules/pyqt6-webengine/qvariant.patch new file mode 100644 index 000000000000..b964a1e1cf2f --- /dev/null +++ b/pkgs/development/python-modules/pyqt6-webengine/qvariant.patch @@ -0,0 +1,12 @@ +diff --git a/sip/QtWebEngineCore/qwebengineframe.sip b/sip/QtWebEngineCore/qwebengineframe.sip +index d5420e6..5a29f29 100644 +--- a/sip/QtWebEngineCore/qwebengineframe.sip ++++ b/sip/QtWebEngineCore/qwebengineframe.sip +@@ -26,6 +26,7 @@ class QWebEngineFrame /NoDefaultCtors/ + { + %TypeHeaderCode + #include ++#include + %End + + public: