From 53e88a76315ccb2d21543cbde77e7c326312dfc2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Apr 2024 10:11:13 +0200 Subject: [PATCH 1/2] python312Packages.pyotgw: 2.1.3 -> 2.2.0 Diff: https://github.com/mvn23/pyotgw/compare/refs/tags/2.1.3...2.2.0 Changelog: https://github.com/mvn23/pyotgw/blob/2.2.0/CHANGELOG.md --- .../python-modules/pyotgw/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 71ef391cb49f..576490e07f56 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -2,27 +2,33 @@ , buildPythonPackage , fetchFromGitHub , pyserial-asyncio +, pyserial-asyncio-fast , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "pyotgw"; - version = "2.1.3"; - format = "setuptools"; + version = "2.2.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mvn23"; - repo = pname; + repo = "pyotgw"; rev = "refs/tags/${version}"; - hash = "sha256-XIwBGjvIulKLmYZIorKIJwoHTNOIYYX8US2Na8MZ2LA="; + hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM="; }; - propagatedBuildInputs = [ - pyserial-asyncio + build-system = [ + setuptools + ]; + + dependencies = [ + pyserial-asyncio-fast ]; nativeCheckInputs = [ From 2289c4950d46c106c899b11c6b00ac06460723bb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 30 Apr 2024 10:11:44 +0200 Subject: [PATCH 2/2] python312Packages.pyotgw: format with nixfmt --- .../python-modules/pyotgw/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pyotgw/default.nix b/pkgs/development/python-modules/pyotgw/default.nix index 576490e07f56..0283116b2160 100644 --- a/pkgs/development/python-modules/pyotgw/default.nix +++ b/pkgs/development/python-modules/pyotgw/default.nix @@ -1,12 +1,13 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pyserial-asyncio -, pyserial-asyncio-fast -, pytest-asyncio -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pyserial-asyncio, + pyserial-asyncio-fast, + pytest-asyncio, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -23,22 +24,16 @@ buildPythonPackage rec { hash = "sha256-SowM+glni1PGkM87JT9+QWTD4Tu9XmsfXg99GZzSCJM="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyserial-asyncio-fast - ]; + dependencies = [ pyserial-asyncio-fast ]; nativeCheckInputs = [ pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "pyotgw" - ]; + pythonImportsCheck = [ "pyotgw" ]; meta = with lib; { description = "Python module to interact the OpenTherm Gateway";