From 593d18f415a69718c0b4e20f899a71905cade908 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 14:11:47 +0100 Subject: [PATCH 1/2] python312Packages.nad-receiver: refactor --- .../python-modules/nad-receiver/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix index 1eb1000f0259..5b8e4e0b6e9a 100644 --- a/pkgs/development/python-modules/nad-receiver/default.nix +++ b/pkgs/development/python-modules/nad-receiver/default.nix @@ -4,12 +4,14 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "nad-receiver"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "joopert"; @@ -18,7 +20,9 @@ buildPythonPackage rec { hash = "sha256-jRMk/yMA48ei+g/33+mMYwfwixaKTMYcU/z/VOoJbvY="; }; - propagatedBuildInputs = [ pyserial ]; + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -27,7 +31,8 @@ buildPythonPackage rec { meta = with lib; { description = "Python interface for NAD receivers"; homepage = "https://github.com/joopert/nad_receiver"; - license = with licenses; [ mit ]; + changelog = "https://github.com/joopert/nad_receiver/releases/tag/${version}"; + license = licenses.mit; maintainers = with maintainers; [ fab ]; }; } From 1c7a42f6781774fad70c7b57dee7c5a33d6ab9f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Jan 2025 14:15:38 +0100 Subject: [PATCH 2/2] python313Packages.nad-receiver: add standard-telnetlib for Python 3.13 --- pkgs/development/python-modules/nad-receiver/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nad-receiver/default.nix b/pkgs/development/python-modules/nad-receiver/default.nix index 5b8e4e0b6e9a..35b6cacf54f8 100644 --- a/pkgs/development/python-modules/nad-receiver/default.nix +++ b/pkgs/development/python-modules/nad-receiver/default.nix @@ -1,11 +1,13 @@ { lib, - pyserial, buildPythonPackage, fetchFromGitHub, + pyserial, pytestCheckHook, pythonAtLeast, + pythonOlder, setuptools, + standard-telnetlib, }: buildPythonPackage rec { @@ -13,6 +15,8 @@ buildPythonPackage rec { version = "0.3.0"; pyproject = true; + disabled = pythonOlder "3.7"; + src = fetchFromGitHub { owner = "joopert"; repo = "nad_receiver"; @@ -22,7 +26,7 @@ buildPythonPackage rec { build-system = [ setuptools ]; - dependencies = [ pyserial ]; + dependencies = [ pyserial ] ++ lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; nativeCheckInputs = [ pytestCheckHook ];