From 19c489c7f728da08e3116b44850f446b4716c727 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 3 Sep 2025 22:13:05 +0200
Subject: [PATCH 1/2] python3Packages.echo: use pyproject, unbreak

---
 pkgs/development/python-modules/echo/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index ca2d32af37a7..9c9dc5549d78 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -17,9 +17,9 @@
 buildPythonPackage rec {
   pname = "echo";
   version = "0.11.0";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "glue-viz";
@@ -28,15 +28,18 @@ buildPythonPackage rec {
     sha256 = "sha256-Uikzn9vbLctiZ6W0uA6hNvr7IB/FhCcHk+JxBW7yrA4=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
     setuptools-scm
+  ];
+
+  nativeBuildInputs = [
     qt6.wrapQtAppsHook
   ];
 
   buildInputs = lib.optionals (pythonOlder "3.9") [ libxcrypt ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     qt6.qtconnectivity
     qt6.qtbase
     qt6.qttools

From 795a54c58eaff565d3f700ee4ede0bdd84aa9c3d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 3 Sep 2025 22:14:03 +0200
Subject: [PATCH 2/2] python3Packages.echo: enable tests

---
 pkgs/development/python-modules/echo/default.nix | 11 ++++++++---
 pkgs/top-level/python-packages.nix               |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/echo/default.nix b/pkgs/development/python-modules/echo/default.nix
index 9c9dc5549d78..eed34a6e10fe 100644
--- a/pkgs/development/python-modules/echo/default.nix
+++ b/pkgs/development/python-modules/echo/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
@@ -10,6 +11,7 @@
   qt6,
   qtpy,
   pyqt6,
+  mesa,
   pytestCheckHook,
   pytest-cov-stub,
 }:
@@ -48,11 +50,14 @@ buildPythonPackage rec {
     qtpy
   ];
 
-  # collecting ... qt.qpa.xcb: could not connect to display
-  # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found.
-  doCheck = false;
+  doCheck = lib.meta.availableOn stdenv.hostPlatform mesa.llvmpipeHook;
+
+  preCheck = ''
+    export QT_QPA_PLATFORM=offscreen
+  '';
 
   nativeCheckInputs = [
+    mesa.llvmpipeHook
     pytestCheckHook
     pytest-cov-stub
   ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 989f26ad914b..4d9d1c81d059 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4561,7 +4561,9 @@ self: super: with self; {
 
   ecdsa = callPackage ../development/python-modules/ecdsa { };
 
-  echo = callPackage ../development/python-modules/echo { };
+  echo = callPackage ../development/python-modules/echo {
+    inherit (pkgs) mesa;
+  };
 
   ecoaliface = callPackage ../development/python-modules/ecoaliface { };