From e20bc660ea2d5d66ee98fa024f98c4a20fdf0b87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Nov 2025 11:42:39 +0100 Subject: [PATCH 1/2] python313Packages.aiohwenergy: modernize --- .../python-modules/aiohwenergy/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index 87f62352565b..101900561c16 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -3,24 +3,24 @@ aiohttp, buildPythonPackage, fetchFromGitHub, - pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "aiohwenergy"; version = "0.8.0"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchFromGitHub { owner = "DCSBL"; repo = "aiohwenergy"; - rev = version; + tag = version; hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; - propagatedBuildInputs = [ aiohttp ]; + build-system = [ setuptools ]; + + dependencies = [ aiohttp ]; # Project has no tests doCheck = false; @@ -30,6 +30,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library to interact with the HomeWizard Energy devices API"; homepage = "https://github.com/DCSBL/aiohwenergy"; + changelog = "https://github.com/DCSBL/aiohwenergy/releases/tag/${src.tag}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; From f4cf313507c86bdc00c730988c699c40ef98018f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Nov 2025 11:45:46 +0100 Subject: [PATCH 2/2] python313Packages.aiohwenergy: patch async_timeout --- pkgs/development/python-modules/aiohwenergy/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index 101900561c16..736d6805c7d3 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -18,6 +18,12 @@ buildPythonPackage rec { hash = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; + postPatch = '' + # Replace async_timeout with asyncio.timeout + substituteInPlace aiohwenergy/hwenergy.py \ + --replace-fail "async_timeout" "asyncio" + ''; + build-system = [ setuptools ]; dependencies = [ aiohttp ];