yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update_hardware_config: migrate from nix_shell to run_cmd

Browse Source
This commit is contained in:
Jörg Thalheim
2025-04-16 19:25:46 +02:00
parent 80a252cf1a
commit ed68a4dde1
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clan-cli/clan_cli/machines/hardware.py
View File

@@ -13,7 +13,7 @@ from clan_cli.errors import ClanCmdError, ClanError
from clan_cli.flake import Flake from clan_cli.flake import Flake
from clan_cli.git import commit_file from clan_cli.git import commit_file
from clan_cli.machines.machines import Machine from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_config, nix_eval, nix_shell from clan_cli.nix import nix_config, nix_eval, run_cmd
from .types import machine_name_type from .types import machine_name_type
@@ -140,11 +140,11 @@ def generate_machine_hardware_info(opts: HardwareGenerateOptions) -> HardwareCon
if host.user != "root": if host.user != "root":
config_command.insert(0, "sudo") config_command.insert(0, "sudo")
deps = ["nixpkgs#openssh"] deps = ["openssh"]
if opts.password: if opts.password:
deps += ["nixpkgs#sshpass"] deps += ["sshpass"]
cmd = nix_shell( cmd = run_cmd(
deps, deps,
[ [
*(["sshpass", "-p", opts.password] if opts.password else []), *(["sshpass", "-p", opts.password] if opts.password else []),