@@ -14,7 +14,7 @@ from clan_cli.completions import (
|
||||
)
|
||||
from clan_cli.errors import ClanError
|
||||
from clan_cli.machines.machines import Machine
|
||||
from clan_cli.nix import nix_shell
|
||||
from clan_cli.nix import nix_shell_legacy
|
||||
from clan_cli.ssh.host import Host, is_ssh_reachable
|
||||
from clan_cli.ssh.host_key import HostKeyCheck
|
||||
from clan_cli.ssh.parse import parse_deployment_address
|
||||
@@ -65,8 +65,8 @@ def find_reachable_host(
|
||||
|
||||
|
||||
def qrcode_scan(picture_file: Path) -> str:
|
||||
cmd = nix_shell(
|
||||
["zbar"],
|
||||
cmd = nix_shell_legacy(
|
||||
["nixpkgs#zbar"],
|
||||
[
|
||||
"zbarimg",
|
||||
"--quiet",
|
||||
|
||||
@@ -10,7 +10,7 @@ from dataclasses import dataclass
|
||||
from clan_cli.async_run import AsyncRuntime
|
||||
from clan_cli.cmd import Log, RunOpts, run
|
||||
from clan_cli.errors import TorConnectionError, TorSocksError
|
||||
from clan_cli.nix import nix_shell
|
||||
from clan_cli.nix import nix_shell_legacy
|
||||
|
||||
log = logging.getLogger(__name__)
|
||||
|
||||
@@ -116,8 +116,8 @@ def spawn_tor(runtime: AsyncRuntime) -> None:
|
||||
def start_tor() -> None:
|
||||
"""Starts Tor process using nix-shell."""
|
||||
cmd_args = ["tor", "--HardwareAccel", "1"]
|
||||
packages = ["tor"]
|
||||
cmd = nix_shell(packages, cmd_args)
|
||||
packages = ["nixpkgs#tor"]
|
||||
cmd = nix_shell_legacy(packages, cmd_args)
|
||||
runtime.async_run(None, run, cmd, RunOpts(log=Log.BOTH))
|
||||
log.debug("Attempting to start Tor")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user