From ab897a8c62a08d0a2aee7430825807af350b3c9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Jun 2024 00:49:35 +0200
Subject: [PATCH 1/2] nixos/test-driver: fix return value of subtest function

Mypy since version 1.10.0 complains about this:

> test_driver/driver.py:109: error: No return value expected  [return-value]
---
 nixos/lib/test-driver/test_driver/driver.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/lib/test-driver/test_driver/driver.py b/nixos/lib/test-driver/test_driver/driver.py
index 10092fc966c8..01b64b92e977 100644
--- a/nixos/lib/test-driver/test_driver/driver.py
+++ b/nixos/lib/test-driver/test_driver/driver.py
@@ -106,7 +106,6 @@ class Driver:
         with self.logger.subtest(name):
             try:
                 yield
-                return True
             except Exception as e:
                 self.logger.error(f'Test "{name}" failed with error: "{e}"')
                 raise e

From 6791c1a7178d00be55532c0e07a2d5311521fba1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Jun 2024 01:04:34 +0200
Subject: [PATCH 2/2] python312Packages.mypy: run nixos-test-driver test in
 passthru

Failing typing checks on the test-driver result in channel blockers.
---
 pkgs/development/python-modules/mypy/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/mypy/default.nix b/pkgs/development/python-modules/mypy/default.nix
index b81f46a10808..5dad7136d271 100644
--- a/pkgs/development/python-modules/mypy/default.nix
+++ b/pkgs/development/python-modules/mypy/default.nix
@@ -26,6 +26,7 @@
   filelock,
   pytest-xdist,
   pytestCheckHook,
+  nixosTests,
 }:
 
 buildPythonPackage rec {
@@ -118,6 +119,10 @@ buildPythonPackage rec {
       "mypyc/test/test_run.py"
     ];
 
+  passthru.tests = {
+    inherit (nixosTests) nixos-test-driver;
+  };
+
   meta = with lib; {
     description = "Optional static typing for Python";
     homepage = "https://www.mypy-lang.org";