From 54eedc1c574b81fcbbf8b9c10a18fd00b5571f22 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 21:16:31 +0700 Subject: [PATCH 1/2] python3Packages.labgrid: fix test_help under python 3.14 --- pkgs/development/python-modules/labgrid/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index e4bb6ac0eef2..6db1ea88e807 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -4,6 +4,7 @@ buildPythonPackage, fetchFromGitHub, fetchpatch, + fetchpatch2, grpcio, grpcio-tools, grpcio-reflection, @@ -53,6 +54,11 @@ buildPythonPackage rec { 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"; + hash = "sha256-72nMGSVnKc7hq1B3EukbqOjMSj9xcXpu1eOlXnMUo1w="; + }) ]; build-system = [ From c4f447187c26071d8a5f35a5eeda213f2dff6347 Mon Sep 17 00:00:00 2001 From: Harinn Date: Sun, 10 May 2026 21:55:52 +0700 Subject: [PATCH 2/2] python3Packages.labgrid: skip flaky test_remoteplace_target --- pkgs/development/python-modules/labgrid/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 6db1ea88e807..e886c06e3618 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -56,8 +56,8 @@ buildPythonPackage rec { }) # Fix test_help under python 3.14 argparse colored output. (fetchpatch2 { - url = "https://github.com/labgrid-project/labgrid/commit/417ace60b9dc043767afb312113a02bcb0807b17.patch"; - hash = "sha256-72nMGSVnKc7hq1B3EukbqOjMSj9xcXpu1eOlXnMUo1w="; + url = "https://github.com/labgrid-project/labgrid/commit/417ace60b9dc043767afb312113a02bcb0807b17.patch?full_index=1"; + hash = "sha256-QCkO/PQbosqUldzJiOyF6BHvyzZI06CGs9IxHPPa6Ek="; }) ]; @@ -104,6 +104,9 @@ buildPythonPackage rec { "test_argument_device_expansion" "test_argument_file_expansion" "test_local_managedfile" + + # flaky: teardown race on x86_64-linux + "test_remoteplace_target" ]; pytestFlags = [ "--benchmark-disable" ];