From 32737b1e2ad0d99ae0a5837dcabd65df954c34b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Aug 2025 16:07:51 +0000 Subject: [PATCH 1/2] python3Packages.canopen: 2.3.0 -> 2.4.1 --- pkgs/development/python-modules/canopen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 320dfd776b2d..0ff10b22532b 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "canopen"; - version = "2.3.0"; + version = "2.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eSCEqTwTjVsqQG3dLU61ziCPA72P2mD4GtK7jVbGuCc="; + hash = "sha256-IKhLxJizTa3XnOzkZ9O74ZWRwcAqjzkzG8xgZcTYsus="; }; nativeBuildInputs = [ setuptools-scm ]; From 71263d016a93915a8ab3b1a1f7c20af9ece8630d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 9 Aug 2025 00:16:24 +0200 Subject: [PATCH 2/2] python313Packages.canopen: refactor --- .../python-modules/canopen/default.nix | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/canopen/default.nix b/pkgs/development/python-modules/canopen/default.nix index 0ff10b22532b..0a2ec5b2093d 100644 --- a/pkgs/development/python-modules/canopen/default.nix +++ b/pkgs/development/python-modules/canopen/default.nix @@ -1,32 +1,30 @@ { lib, buildPythonPackage, - fetchPypi, - setuptools-scm, - python-can, canmatrix, + fetchPypi, pytestCheckHook, - pythonOlder, + python-can, + setuptools-scm, }: buildPythonPackage rec { pname = "canopen"; version = "2.4.1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + pyproject = true; src = fetchPypi { inherit pname version; hash = "sha256-IKhLxJizTa3XnOzkZ9O74ZWRwcAqjzkzG8xgZcTYsus="; }; - nativeBuildInputs = [ setuptools-scm ]; + build-system = [ setuptools-scm ]; - propagatedBuildInputs = [ - python-can - canmatrix - ]; + dependencies = [ python-can ]; + + optional-dependencies = { + db_export = [ canmatrix ]; + }; nativeCheckInputs = [ pytestCheckHook ];