From 8420cea0746d01950418def1778096d9aa78c8de Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:17:35 +0200 Subject: [PATCH 1/3] =?UTF-8?q?python312Packages.elkm1-lib=C2=A3:=20refact?= =?UTF-8?q?or?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/elkm1-lib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index f64cbda4885b..534a32540290 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "elkm1-lib"; version = "2.2.6"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -24,11 +24,11 @@ buildPythonPackage rec { hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ async-timeout pyserial-asyncio ]; From 10f483d2b95f11b4de2adfeb87022b433c77001b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:18:41 +0200 Subject: [PATCH 2/3] python312Packages.elkm1-lib: 2.2.6 -> 2.2.7 Diff: https://github.com/gwww/elkm1/compare/refs/tags/2.2.6...2.2.7 Changelog: https://github.com/gwww/elkm1/blob/2.2.7/CHANGELOG.md --- pkgs/development/python-modules/elkm1-lib/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 534a32540290..6e3e88010f71 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -4,7 +4,7 @@ , fetchFromGitHub , fetchpatch , poetry-core -, pyserial-asyncio +, pyserial-asyncio-fast , pytest-asyncio , pytestCheckHook , pythonOlder @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "elkm1-lib"; - version = "2.2.6"; + version = "2.2.7"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "gwww"; repo = "elkm1"; rev = "refs/tags/${version}"; - hash = "sha256-5Jmn/ywyg6fmp0ZxPf79ET+JWPF4VjDJMwj/qU6ckS0="; + hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; }; build-system = [ @@ -30,7 +30,7 @@ buildPythonPackage rec { dependencies = [ async-timeout - pyserial-asyncio + pyserial-asyncio-fast ]; nativeCheckInputs = [ From 7e2df24c9f3b9ce6b4d0b7ba4dc6bc2d3eac6675 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 2 May 2024 09:19:02 +0200 Subject: [PATCH 3/3] python312Packages.elkm1-lib: format with nixfmt --- .../python-modules/elkm1-lib/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix index 6e3e88010f71..cf8c39c308dd 100644 --- a/pkgs/development/python-modules/elkm1-lib/default.nix +++ b/pkgs/development/python-modules/elkm1-lib/default.nix @@ -1,13 +1,14 @@ -{ lib -, async-timeout -, buildPythonPackage -, fetchFromGitHub -, fetchpatch -, poetry-core -, pyserial-asyncio-fast -, pytest-asyncio -, pytestCheckHook -, pythonOlder +{ + lib, + async-timeout, + buildPythonPackage, + fetchFromGitHub, + fetchpatch, + poetry-core, + pyserial-asyncio-fast, + pytest-asyncio, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -24,9 +25,7 @@ buildPythonPackage rec { hash = "sha256-5YdmZO/8HimQ9Ft/K/I6xu0Av2SjUBp3+poBe7aVUpM="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ async-timeout @@ -38,9 +37,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportsCheck = [ - "elkm1_lib" - ]; + pythonImportsCheck = [ "elkm1_lib" ]; meta = with lib; { description = "Python module for interacting with ElkM1 alarm/automation panel";