From 13c6543a88d6b4f28226c0c192c3849488f7594e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 May 2025 16:17:28 +0200 Subject: [PATCH 1/2] installation: put use_tor option in right place we would always disable tor, even if enabled. --- pkgs/clan-cli/clan_cli/machines/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/machines/install.py b/pkgs/clan-cli/clan_cli/machines/install.py index 34d2dbf4a..1374d979a 100644 --- a/pkgs/clan-cli/clan_cli/machines/install.py +++ b/pkgs/clan-cli/clan_cli/machines/install.py @@ -163,6 +163,7 @@ def install_command(args: argparse.Namespace) -> None: target_host = args.target_host deploy_info: DeployInfo | None = ssh_command_parse(args) + use_tor = False if deploy_info and not args.target_host: host = find_reachable_host(deploy_info, host_key_check) if host is None: @@ -184,7 +185,6 @@ def install_command(args: argparse.Namespace) -> None: nix_options=args.option, override_target_host=target_host, ) - use_tor = False if machine._class_ == "darwin": msg = "Installing macOS machines is not yet supported" From 41598b8f349b8b85c033573112561689705a5ce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 16 May 2025 16:31:25 +0200 Subject: [PATCH 2/2] machines.eval_nix: remove unused refresh parameter --- pkgs/clan-cli/clan_cli/machines/machines.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/machines/machines.py b/pkgs/clan-cli/clan_cli/machines/machines.py index d18057fcf..42ccf1585 100644 --- a/pkgs/clan-cli/clan_cli/machines/machines.py +++ b/pkgs/clan-cli/clan_cli/machines/machines.py @@ -222,7 +222,6 @@ class Machine: def eval_nix( self, attr: str, - refresh: bool = False, extra_config: None | dict = None, nix_options: list[str] | None = None, ) -> Any: