From 326633d1b835a1f6b582eb6a9071ddefbb561831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 9 Apr 2025 08:34:37 +0000 Subject: [PATCH] hardware: only include sshpass if we are actually using it. --- pkgs/clan-cli/clan_cli/machines/hardware.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/machines/hardware.py b/pkgs/clan-cli/clan_cli/machines/hardware.py index 6835cc725..1cd0d8450 100644 --- a/pkgs/clan-cli/clan_cli/machines/hardware.py +++ b/pkgs/clan-cli/clan_cli/machines/hardware.py @@ -140,11 +140,12 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon if host.user != "root": config_command.insert(0, "sudo") + deps = ["nixpkgs#openssh"] + if opts.password: + deps += ["nixpkgs#sshpass"] + cmd = nix_shell( - [ - "nixpkgs#openssh", - "nixpkgs#sshpass", - ], + deps, [ *(["sshpass", "-p", opts.password] if opts.password else []), "ssh",