From 6b07fb09c2435d07b9656c3874fcd0670222817a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Apr 2026 10:41:14 +0300 Subject: [PATCH 1/3] python3.pkgs.pyqt6: use finalAttrs --- pkgs/development/python-modules/pyqt/6.x.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 5d6bd6d8337e..4fabf245e520 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -24,7 +24,7 @@ withPdf ? true, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyqt6"; version = "6.9.0"; pyproject = true; @@ -66,7 +66,7 @@ buildPythonPackage rec { EOF substituteInPlace pyproject.toml \ - --replace-fail 'version = "${version}"' 'version = "${lib.versions.pad 3 version}"' + --replace-fail 'version = "${finalAttrs.version}"' 'version = "${lib.versions.pad 3 finalAttrs.version}"' ''; enableParallelBuilding = true; @@ -166,4 +166,4 @@ buildPythonPackage rec { inherit (mesa.meta) platforms; maintainers = with lib.maintainers; [ LunNova ]; }; -} +}) From ee4a8675f4248d194eddbff4ea593fd82929551e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Apr 2026 10:47:19 +0300 Subject: [PATCH 2/3] python3.pkgs.pyqt6: use fetchPypi The 6.9.0 version was bumped in Nixpkgs - in 8f29c5ebda887457a5bf15fbeb5b735cf4133255, 2 days before upstream uploaded the tarball to pypi.org. Also, they changed the project name to all lower case. --- pkgs/development/python-modules/pyqt/6.x.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 4fabf245e520..8688c4516b88 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -2,7 +2,7 @@ lib, stdenv, buildPythonPackage, - fetchzip, + fetchPypi, pkg-config, dbus, lndir, @@ -29,14 +29,10 @@ buildPythonPackage (finalAttrs: { version = "6.9.0"; pyproject = true; - # It looks like a stable release, but is it? Who knows. - # It's not on PyPI proper yet, at least, and the current - # actually-released version does not build with Qt 6.9, - # so we kinda have to use it. - # "ffs smdh fam" - K900 - src = fetchzip { - url = "https://web.archive.org/web/20250406083944/https://www.riverbankcomputing.com/pypi/packages/PyQt6/pyqt6-6.9.0.tar.gz"; - hash = "sha256-UZSbz6MqdNtl2r4N8uvgNjQ+28KCzNFb5yFqPcooT5E="; + src = fetchPypi { + pname = "pyqt6"; + inherit (finalAttrs) version; + hash = "sha256-ao/4480YMRu32Tf310HnhwQK5/9HznUcKKlMXN3BtOY="; }; patches = [ From 509d72cb121cf9baadd0fcb65c5d39829ac60ba1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 28 Apr 2026 11:04:36 +0300 Subject: [PATCH 3/3] python3.pkgs.pyqt6: 6.9.0 -> 6.11.0 --- pkgs/development/python-modules/pyqt/6.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyqt/6.x.nix b/pkgs/development/python-modules/pyqt/6.x.nix index 8688c4516b88..84ee543ffa41 100644 --- a/pkgs/development/python-modules/pyqt/6.x.nix +++ b/pkgs/development/python-modules/pyqt/6.x.nix @@ -26,13 +26,13 @@ buildPythonPackage (finalAttrs: { pname = "pyqt6"; - version = "6.9.0"; + version = "6.11.0"; pyproject = true; src = fetchPypi { pname = "pyqt6"; inherit (finalAttrs) version; - hash = "sha256-ao/4480YMRu32Tf310HnhwQK5/9HznUcKKlMXN3BtOY="; + hash = "sha256-Rd1gqmmXbeGRi1zta057aiWr0qkZ7O9f1YJuzHZxiIk="; }; patches = [