From 2418a9ed49ad476d5293d10aaec47b194c105249 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:27:09 +0200 Subject: [PATCH 1/3] python312Packages.heatzypy: 2.2.0 -> 2.5.4 Changelog: https://github.com/cyr-ius/heatzypy/releases/tag/2.5.4 --- pkgs/development/python-modules/heatzypy/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index 9093afc2353a..e2b903404364 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -6,12 +6,12 @@ , pytestCheckHook , pythonOlder , setuptools -, wheel +, setuptools-scm }: buildPythonPackage rec { pname = "heatzypy"; - version = "2.2.0"; + version = "2.5.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Cyr-ius"; repo = "heatzypy"; rev = "refs/tags/${version}"; - hash = "sha256-Q6v1Ob1PY8tpMnd8hchepq983dsZ6lJPCKz83RRwL3w="; + hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; }; postPatch = '' @@ -30,7 +30,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools - wheel + setuptools-scm ]; propagatedBuildInputs = [ From 18ca45c49b764bf20312491e2a5f97641c7be501 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:28:55 +0200 Subject: [PATCH 2/3] python312Packages.heatzypy: refactor --- pkgs/development/python-modules/heatzypy/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index e2b903404364..ecacab2260ef 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -2,7 +2,6 @@ , aiohttp , buildPythonPackage , fetchFromGitHub -, requests , pytestCheckHook , pythonOlder , setuptools @@ -23,19 +22,13 @@ buildPythonPackage rec { hash = "sha256-A01e3duNQmVv9vyOs6+gF/BdevLiYi/uXSq5bKmuRao="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace "replace_by_workflow" "${version}" - ''; - - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp - requests ]; # Module has no tests From c2ea4283a98b8c577661131219cacd6232332e3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 01:29:18 +0200 Subject: [PATCH 3/3] python312Packages.heatzypy: format with nixfmt --- .../python-modules/heatzypy/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/heatzypy/default.nix b/pkgs/development/python-modules/heatzypy/default.nix index ecacab2260ef..843c8cbf1348 100644 --- a/pkgs/development/python-modules/heatzypy/default.nix +++ b/pkgs/development/python-modules/heatzypy/default.nix @@ -1,11 +1,12 @@ -{ lib -, aiohttp -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools -, setuptools-scm +{ + lib, + aiohttp, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, + setuptools-scm, }: buildPythonPackage rec { @@ -27,16 +28,12 @@ buildPythonPackage rec { setuptools-scm ]; - dependencies = [ - aiohttp - ]; + dependencies = [ aiohttp ]; # Module has no tests doCheck = false; - pythonImportsCheck = [ - "heatzypy" - ]; + pythonImportsCheck = [ "heatzypy" ]; meta = with lib; { description = "Module to interact with Heatzy devices";