From 57fc5be4a6160024d1c88581e71ca72857ed5c4b Mon Sep 17 00:00:00 2001 From: Manuel Mendez Date: Tue, 3 Dec 2024 16:04:54 -0500 Subject: [PATCH 1/2] flent: Convert to unittestCheckHook I've figured out a way to use native qt virtual screen instead of xvfb-run which integrates better with our python tooling. Needed to add `badPlatforms = darwin` because in theory flent works on darwin machines but tests aren't passing. This is only showing up now because xvfb-run was limiting flent to linux for us before. --- pkgs/by-name/fl/flent/package.nix | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix index 5e78f6923f30..b585dc0aa8d6 100644 --- a/pkgs/by-name/fl/flent/package.nix +++ b/pkgs/by-name/fl/flent/package.nix @@ -4,7 +4,6 @@ fetchPypi, procps, qt5, - xvfb-run, }: python3Packages.buildPythonApplication rec { pname = "flent"; @@ -25,28 +24,15 @@ python3Packages.buildPythonApplication rec { qtpy ]; - nativeCheckInputs = [ - python3Packages.mock - xvfb-run - ]; - - checkPhase = '' - runHook preCheck + nativeCheckInputs = [ python3Packages.unittestCheckHook ]; + preCheck = '' # we want the gui tests to always run sed -i 's|self.skip|pass; #&|' unittests/test_gui.py - export XDG_RUNTIME_DIR=$(mktemp -d) - export HOME=$(mktemp -d) - cat >test-runner < Date: Tue, 3 Dec 2024 21:28:38 -0500 Subject: [PATCH 2/2] flent: Add passthru.updateScript --- pkgs/by-name/fl/flent/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix index b585dc0aa8d6..9157d4cf28ba 100644 --- a/pkgs/by-name/fl/flent/package.nix +++ b/pkgs/by-name/fl/flent/package.nix @@ -4,6 +4,7 @@ fetchPypi, procps, qt5, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "flent"; @@ -42,6 +43,7 @@ python3Packages.buildPythonApplication rec { ) ''; + passthru.updateScript = nix-update-script { }; meta = { description = "FLExible Network Tester"; homepage = "https://flent.org";