From 3546586dde44eca1f59876c8a07a1ae7d32a5be4 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Fri, 19 Jul 2024 22:20:12 +0200 Subject: [PATCH] fixup! fixup! fixup! clan-vm-manager: Restore to known good version --- formatter.nix | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/formatter.nix b/formatter.nix index 760533ad9..f5a64f8a6 100644 --- a/formatter.nix +++ b/formatter.nix @@ -12,25 +12,32 @@ treefmt.programs.nixfmt.package = pkgs.nixfmt-rfc-style; treefmt.programs.deadnix.enable = true; - treefmt.programs.mypy.directories = { - "pkgs/clan-cli" = { - extraPythonPackages = self'.packages.clan-cli.testDependencies; - modules = [ "clan_cli" ]; - }; - "pkgs/clan-app" = { - extraPythonPackages = - # clan-app currently only exists on linux - (self'.packages.clan-app.externalTestDeps or [ ]) ++ self'.packages.clan-cli.testDependencies; - modules = [ "clan_app" ]; - }; - "pkgs/clan-vm-manager" = { - extraPythonPackages = - # clan-app currently only exists on linux - - self'.packages.clan-vm-manager.testDependencies ++ self'.packages.clan-cli.testDependencies; - modules = [ "clan_vm_manager" ]; - }; - }; + treefmt.programs.mypy.directories = + { + "pkgs/clan-cli" = { + extraPythonPackages = self'.packages.clan-cli.testDependencies; + modules = [ "clan_cli" ]; + }; + "pkgs/clan-app" = { + extraPythonPackages = + # clan-app currently only exists on linux + (self'.packages.clan-app.externalTestDeps or [ ]) ++ self'.packages.clan-cli.testDependencies; + modules = [ "clan_app" ]; + }; + } + // ( + if pkgs.stdenv.isLinux then + { + "pkgs/clan-vm-manager" = { + extraPythonPackages = + # clan-app currently only exists on linux + self'.packages.clan-vm-manager.testDependencies ++ self'.packages.clan-cli.testDependencies; + modules = [ "clan_vm_manager" ]; + }; + } + else + { } + ); treefmt.programs.ruff.check = true; treefmt.programs.ruff.format = true;