From 934cf6e57a6ed8df04339f9fd70a7ba0bc4cb565 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 12 Mar 2024 16:49:18 +0100
Subject: [PATCH] mypy: fix clan-cli import in vm-manager

---
 formatter.nix                       | 1 -
 pkgs/clan-vm-manager/default.nix    | 6 +++++-
 pkgs/clan-vm-manager/pyproject.toml | 4 ----
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/formatter.nix b/formatter.nix
index 852c8cd7d..2b7b6d0a6 100644
--- a/formatter.nix
+++ b/formatter.nix
@@ -15,7 +15,6 @@
     treefmt.programs.mypy.directories = {
       "pkgs/clan-cli".extraPythonPackages = self'.packages.clan-cli.pytestDependencies;
       "pkgs/clan-vm-manager".extraPythonPackages = self'.packages.clan-vm-manager.propagatedBuildInputs;
-      # "pkgs/clan-vm-manager".options = ["--verbose"];
     };
 
     treefmt.settings.formatter.nix = {
diff --git a/pkgs/clan-vm-manager/default.nix b/pkgs/clan-vm-manager/default.nix
index a5d2c15d2..13fb2bbec 100644
--- a/pkgs/clan-vm-manager/default.nix
+++ b/pkgs/clan-vm-manager/default.nix
@@ -44,7 +44,11 @@ python3.pkgs.buildPythonApplication {
   buildInputs = [ gtk4 libadwaita gnome.adwaita-icon-theme ];
 
   # We need to propagate the build inputs to nix fmt / treefmt
-  propagatedBuildInputs = [ pygobject3 clan-cli pygobject-stubs ];
+  propagatedBuildInputs = [
+    (python3.pkgs.toPythonModule clan-cli)
+    pygobject3
+    pygobject-stubs
+  ];
 
   # also re-expose dependencies so we test them in CI
   passthru = {
diff --git a/pkgs/clan-vm-manager/pyproject.toml b/pkgs/clan-vm-manager/pyproject.toml
index 8016c21eb..b2061a55e 100644
--- a/pkgs/clan-vm-manager/pyproject.toml
+++ b/pkgs/clan-vm-manager/pyproject.toml
@@ -22,10 +22,6 @@ disallow_untyped_calls = true
 disallow_untyped_defs = true
 no_implicit_optional = true
 
-[[tool.mypy.overrides]]
-module = "clan_cli.*"
-ignore_missing_imports = true
-
 [tool.ruff]
 target-version = "py311"
 line-length = 88