From 6fd55442d257c9b06a3193f30f2c6beca0486197 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:44:15 +0000 Subject: [PATCH 1/3] python312Packages.labgrid: 23.0.6 -> 24.0 --- pkgs/development/python-modules/labgrid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index b283a72b09ed..57e1a751cd52 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -27,13 +27,13 @@ buildPythonPackage rec { pname = "labgrid"; - version = "23.0.6"; + version = "24.0"; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; rev = "refs/tags/v${version}"; - hash = "sha256-UAfBzQZeFNs2UJSFb5fH5wHXQoVU/dOTFciR0/UB7vc="; + hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g="; }; nativeBuildInputs = [ From fc6ea8c412ba8ac1216641bd0d4127e3b12e1981 Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:44:56 +0900 Subject: [PATCH 2/3] python312Packages.labgrid: update meta.homepage --- pkgs/development/python-modules/labgrid/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 57e1a751cd52..f81fe0c2305a 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -89,7 +89,7 @@ buildPythonPackage rec { meta = with lib; { description = "Embedded control & testing library"; - homepage = "https://labgrid.org"; + homepage = "https://github.com/labgrid-project/labgrid"; license = licenses.lgpl21Plus; maintainers = with maintainers; [ emantor ]; platforms = with platforms; linux; From ac8470c1ce70cb66aeac851f9f9675545e1a5efe Mon Sep 17 00:00:00 2001 From: natsukium Date: Sun, 18 Aug 2024 09:48:21 +0900 Subject: [PATCH 3/3] python312Packages.labgrid: refactor --- .../python-modules/labgrid/default.nix | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index f81fe0c2305a..955f62b568d8 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -8,7 +8,6 @@ lib, mock, openssh, - packaging, pexpect, psutil, pyserial, @@ -21,13 +20,13 @@ requests, setuptools, setuptools-scm, - wheel, xmodem, }: buildPythonPackage rec { pname = "labgrid"; version = "24.0"; + pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; @@ -36,20 +35,16 @@ buildPythonPackage rec { hash = "sha256-XlndAmLkDjb4S2BD85noTMJCeqa5srZocjgg1x6Ry/g="; }; - nativeBuildInputs = [ + build-system = [ setuptools setuptools-scm - wheel ]; - pyproject = true; - - propagatedBuildInputs = [ + dependencies = [ ansicolors attrs autobahn jinja2 - packaging pexpect pyserial pyudev @@ -59,20 +54,10 @@ buildPythonPackage rec { xmodem ]; - pythonRelaxDeps = [ - "attrs" - "autobahn" - "jinja2" - "packaging" - "pexpect" - "pytest" - "pyudev" - "requests" - "xmodem" - ]; - pythonRemoveDeps = [ "pyserial-labgrid" ]; + pythonImportsCheck = [ "labgrid" ]; + nativeCheckInputs = [ mock openssh