diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index e3ddb1fbca8b..9863e41d97a0 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -2,6 +2,7 @@ ansicolors, attrs, buildPythonPackage, + exceptiongroup, fetchFromGitHub, fetchpatch, fetchpatch2, @@ -24,47 +25,28 @@ pyudev, pyusb, pyyaml, + py-netgear-plus, requests, setuptools, setuptools-scm, + util-linux, xmodem, }: buildPythonPackage (finalAttrs: { pname = "labgrid"; - version = "25.0.1"; + version = "26.0"; pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; tag = "v${finalAttrs.version}"; - hash = "sha256-cLofkkp2T6Y9nQ5LIS7w9URZlt8DQNN8dm3NnrvcKWY="; + hash = "sha256-SX7FIaSl2sy1hMPEmgGCQQAzXUeFZRw/CrXf/ZHRBDU="; }; passthru.updateScript = nix-update-script { }; - # Remove after package bump - patches = [ - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/4a66b43882811d50600e37aa39b24ec40398d184.patch"; - sha256 = "sha256-eJMB1qFWiDzQXEB4dYOHYMQqCPHXEWCwWjNNY0yTC2s="; - }) - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/d9933b3ec444c35d98fd41685481ecae8ff28bf4.patch"; - sha256 = "sha256-Zx5j+CD6Q89dLmTl5QSKI9M1IcZ97OCjEWtEbG+CKWE="; - }) - (fetchpatch { - url = "https://github.com/Emantor/labgrid/commit/f0b672afe1e8976c257f0adff9bf6e7ee9760d6f.patch"; - sha256 = "sha256-M7rg+W9SjWDdViWyWe3ERzbUowxzf09c4w1yG3jQGak="; - }) - # Fix test_help under python 3.14 argparse colored output. - (fetchpatch2 { - url = "https://github.com/labgrid-project/labgrid/commit/417ace60b9dc043767afb312113a02bcb0807b17.patch?full_index=1"; - hash = "sha256-QCkO/PQbosqUldzJiOyF6BHvyzZI06CGs9IxHPPa6Ek="; - }) - ]; - build-system = [ setuptools setuptools-scm @@ -73,6 +55,7 @@ buildPythonPackage (finalAttrs: { dependencies = [ ansicolors attrs + exceptiongroup jinja2 grpcio grpcio-tools @@ -99,6 +82,8 @@ buildPythonPackage (finalAttrs: { pytest-benchmark pytest-mock pytest-dependency + util-linux + py-netgear-plus ]; disabledTests = [ @@ -112,6 +97,15 @@ buildPythonPackage (finalAttrs: { # flaky: teardown race on x86_64-linux "test_remoteplace_target" + + # netns tests require working SSH & Agentwrapper + "test_tcp" + "test_udp" + "test_getaddrinfo" + "test_closed_socket" + "test_dup" + "test_detach" + "test_socks" ]; pytestFlags = [ "--benchmark-disable" ];