From 695eb35d6d220f76b344fe3484cc6b776cd8cf1b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Jan 2024 10:45:17 +0100 Subject: [PATCH 1/2] python311Packages.plugwise: 0.35.4 -> 0.36.2 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.35.4...v0.36.2 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.36.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 7eb310c93008..fb1d00d2e65a 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.35.4"; + version = "0.36.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-5clHLE8QavccxAhBEa6W2yOtWYmQ5oa9ZcctEIKXru4="; + hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; }; propagatedBuildInputs = [ From 1418371835e49be9cb191ccc92cdd541672ee9b7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 1 Jan 2024 10:52:11 +0100 Subject: [PATCH 2/2] python311Packages.plugwise: refactor --- .../python-modules/plugwise/default.nix | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index fb1d00d2e65a..e6ef993bbd8e 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -14,24 +14,35 @@ , pytestCheckHook , python-dateutil , pythonOlder -, pytz , semver +, setuptools +, wheel }: buildPythonPackage rec { pname = "plugwise"; version = "0.36.2"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { - owner = pname; + owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; hash = "sha256-3TTrfvhTQIhig0QUP56+IkciiboXZD4025FvotAZgzo="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "wheel~=0.40.0" "wheel" + ''; + + nativeBuildInputs = [ + setuptools + wheel + ]; + propagatedBuildInputs = [ aiohttp async-timeout @@ -40,7 +51,6 @@ buildPythonPackage rec { munch pyserial python-dateutil - pytz semver ];