diff --git a/pkgs/development/python-modules/labgrid/default.nix b/pkgs/development/python-modules/labgrid/default.nix index 1ae59e870c67..27c7f542572c 100644 --- a/pkgs/development/python-modules/labgrid/default.nix +++ b/pkgs/development/python-modules/labgrid/default.nix @@ -1,9 +1,12 @@ { ansicolors, attrs, - autobahn, buildPythonPackage, fetchFromGitHub, + fetchpatch, + grpcio, + grpcio-tools, + grpcio-reflection, jinja2, lib, mock, @@ -12,6 +15,7 @@ psutil, pyserial, pytestCheckHook, + pytest-benchmark, pytest-dependency, pytest-mock, pyudev, @@ -25,16 +29,32 @@ buildPythonPackage rec { pname = "labgrid"; - version = "24.0.2"; + version = "25.0"; pyproject = true; src = fetchFromGitHub { owner = "labgrid-project"; repo = "labgrid"; tag = "v${version}"; - hash = "sha256-rW9peT4zoPzVR6Kl/E8G4qBig/x/lvxpCtvNtwIIL+U="; + hash = "sha256-Czq8Wx8ThKLcR8GjdlRND+Y1nY1PTl6wDkz9ml83DBk="; }; + # 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="; + }) + ]; + build-system = [ setuptools setuptools-scm @@ -43,8 +63,10 @@ buildPythonPackage rec { dependencies = [ ansicolors attrs - autobahn jinja2 + grpcio + grpcio-tools + grpcio-reflection pexpect pyserial pyudev @@ -63,6 +85,7 @@ buildPythonPackage rec { openssh psutil pytestCheckHook + pytest-benchmark pytest-mock pytest-dependency ]; @@ -72,6 +95,8 @@ buildPythonPackage rec { "test_timing" ]; + pytestFlagsArray = [ "--benchmark-disable" ]; + meta = with lib; { description = "Embedded control & testing library"; homepage = "https://github.com/labgrid-project/labgrid";