From 520a0e93a433f7001084c024f19a37e129958517 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 6 Jan 2026 09:24:37 +0100 Subject: [PATCH 1/3] python313Packages.hap-python: disable failing test on Python 3.14 --- pkgs/development/python-modules/hap-python/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 0b2b5e24aa5c..05ef6ecc5fa5 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -1,8 +1,8 @@ { lib, async-timeout, - buildPythonPackage, base36, + buildPythonPackage, chacha20poly1305-reuseable, cryptography, fetchFromGitHub, @@ -12,6 +12,7 @@ pytest-asyncio, pytest-timeout, pytestCheckHook, + pythonAtLeast, pythonOlder, setuptools, zeroconf, @@ -56,6 +57,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyhap" ]; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # https://github.com/ikalchev/HAP-python/issues/490 + "test_start_from_sync" + ]; + meta = { description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; From 1824a5af81127ae9f412c21786eb9565cef2917b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 6 Jan 2026 09:25:36 +0100 Subject: [PATCH 2/3] python313Packages.hap-python: remove async-timeout --- pkgs/development/python-modules/hap-python/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index 05ef6ecc5fa5..ab59d2b8b14e 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -1,6 +1,5 @@ { lib, - async-timeout, base36, buildPythonPackage, chacha20poly1305-reuseable, @@ -38,9 +37,6 @@ buildPythonPackage rec { h11 orjson zeroconf - ] - ++ lib.optionals (pythonOlder "3.11") [ - async-timeout ]; optional-dependencies.QRCode = [ From 9325d2cd717bb16519dd6ce98d60bf8225c09d96 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 6 Jan 2026 09:29:36 +0100 Subject: [PATCH 3/3] python313Packages.hap-python: migrate to finalAttrs --- pkgs/development/python-modules/hap-python/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hap-python/default.nix b/pkgs/development/python-modules/hap-python/default.nix index ab59d2b8b14e..b9b23ac771e1 100644 --- a/pkgs/development/python-modules/hap-python/default.nix +++ b/pkgs/development/python-modules/hap-python/default.nix @@ -17,7 +17,7 @@ zeroconf, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "hap-python"; version = "5.0.0"; pyproject = true; @@ -25,7 +25,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; - tag = version; + tag = finalAttrs.version; hash = "sha256-+EhxoO5X/ANGh008WE0sJeBsu8SRnuds3hXGxNWpKnk="; }; @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-timeout pytestCheckHook ] - ++ optional-dependencies.QRCode; + ++ lib.flatten (builtins.attrValues finalAttrs.passthru.optional-dependencies); pythonImportsCheck = [ "pyhap" ]; @@ -61,8 +61,8 @@ buildPythonPackage rec { meta = { description = "HomeKit Accessory Protocol implementation"; homepage = "https://github.com/ikalchev/HAP-python"; - changelog = "https://github.com/ikalchev/HAP-python/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/ikalchev/HAP-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ oro ]; }; -} +})