From a35f08fdf199cef10cbb8a056e6b3172097795e7 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 17:06:04 +0200 Subject: [PATCH 1/4] python3Packages.pylacrosse: 0.4 -> 0.5 --- .../python-modules/pylacrosse/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index 7f66f68fee2d..763b5ccd018c 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch2, mock, pyserial, pytestCheckHook, @@ -10,24 +9,16 @@ buildPythonPackage rec { pname = "pylacrosse"; - version = "0.4"; + version = "0.5"; format = "setuptools"; src = fetchFromGitHub { owner = "hthiery"; repo = "python-lacrosse"; tag = version; - hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw="; + hash = "sha256-z2OlYFFK/+BONg22+Vk0kQQ0KJoQnRkjP7OUS/TVpfI="; }; - patches = [ - # Migrate to pytest, https://github.com/hthiery/python-lacrosse/pull/17 - (fetchpatch2 { - url = "https://github.com/hthiery/python-lacrosse/commit/cc2623c667bc252360a9b5ccb4fc05296cf23d9c.patch?full_index=1"; - hash = "sha256-LKryLnXMKj1lVClneyHNVOWM5KPPhOGy0/FX/7Qy/jU="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version = version," "version = '${version}'," From 665f5dc24ab4eb9372c743ee3c465dcea2191cc4 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 17:11:59 +0200 Subject: [PATCH 2/4] python3Packages.pylacrosse: use finalAttrs --- pkgs/development/python-modules/pylacrosse/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index 763b5ccd018c..efe2d7d7722d 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -7,7 +7,7 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pylacrosse"; version = "0.5"; format = "setuptools"; @@ -15,13 +15,13 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "hthiery"; repo = "python-lacrosse"; - tag = version; + tag = finalAttrs.version; hash = "sha256-z2OlYFFK/+BONg22+Vk0kQQ0KJoQnRkjP7OUS/TVpfI="; }; postPatch = '' substituteInPlace setup.py \ - --replace "version = version," "version = '${version}'," + --replace "version = version," "version = '${finalAttrs.version}'," ''; propagatedBuildInputs = [ pyserial ]; @@ -40,4 +40,4 @@ buildPythonPackage rec { license = with lib.licenses; [ lgpl2Plus ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) From 2544d4d0fe571682d34678b6d2f8974441aa8c81 Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 17:15:00 +0200 Subject: [PATCH 3/4] python3Packages.pylacrosse: enable __structuredAttrs --- pkgs/development/python-modules/pylacrosse/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index efe2d7d7722d..9f9e19509009 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -12,6 +12,8 @@ buildPythonPackage (finalAttrs: { version = "0.5"; format = "setuptools"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "hthiery"; repo = "python-lacrosse"; From de8f4eb4ba2139088b934a4a89c1512387cbf06a Mon Sep 17 00:00:00 2001 From: Timo Gottszky Date: Wed, 8 Jul 2026 17:17:19 +0200 Subject: [PATCH 4/4] python3Packages.pylacrosse: migrate to pyproject --- pkgs/development/python-modules/pylacrosse/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylacrosse/default.nix b/pkgs/development/python-modules/pylacrosse/default.nix index 9f9e19509009..8283dff15d8d 100644 --- a/pkgs/development/python-modules/pylacrosse/default.nix +++ b/pkgs/development/python-modules/pylacrosse/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + setuptools, mock, pyserial, pytestCheckHook, @@ -10,7 +11,7 @@ buildPythonPackage (finalAttrs: { pname = "pylacrosse"; version = "0.5"; - format = "setuptools"; + pyproject = true; __structuredAttrs = true; @@ -26,7 +27,9 @@ buildPythonPackage (finalAttrs: { --replace "version = version," "version = '${finalAttrs.version}'," ''; - propagatedBuildInputs = [ pyserial ]; + build-system = [ setuptools ]; + + dependencies = [ pyserial ]; nativeCheckInputs = [ mock