rename nix_shell_legacy to nix_shell and run_cmd to nix_shell

Than it's more obvious that we need to migrate.
This commit is contained in:
Jörg Thalheim
2025-04-16 19:57:13 +02:00
committed by Mic92
parent ed123d2332
commit 837789010e
24 changed files with 69 additions and 65 deletions

View File

@@ -18,7 +18,7 @@ from clan_cli.errors import ClanError
from clan_cli.git import commit_files
from clan_cli.machines.inventory import get_all_machines, get_selected_machines
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_shell
from clan_cli.nix import nix_shell_legacy
from .check import check_secrets
from .public_modules import FactStoreBase
@@ -39,7 +39,7 @@ def read_multiline_input(prompt: str = "Finish with Ctrl-D") -> str:
def bubblewrap_cmd(generator: str, facts_dir: Path, secrets_dir: Path) -> list[str]:
# fmt: off
return nix_shell(
return nix_shell_legacy(
[
"nixpkgs#bash",
"nixpkgs#bubblewrap",

View File

@@ -5,7 +5,7 @@ from typing import override
from clan_cli.cmd import Log, RunOpts
from clan_cli.machines.machines import Machine
from clan_cli.nix import nix_shell
from clan_cli.nix import nix_shell_legacy
from . import SecretStoreBase
@@ -18,7 +18,7 @@ class SecretStore(SecretStoreBase):
self, service: str, name: str, value: bytes, groups: list[str]
) -> Path | None:
subprocess.run(
nix_shell(
nix_shell_legacy(
["nixpkgs#pass"],
["pass", "insert", "-m", f"machines/{self.machine.name}/{name}"],
),
@@ -29,7 +29,7 @@ class SecretStore(SecretStoreBase):
def get(self, service: str, name: str) -> bytes:
return subprocess.run(
nix_shell(
nix_shell_legacy(
["nixpkgs#pass"],
["pass", "show", f"machines/{self.machine.name}/{name}"],
),
@@ -51,7 +51,7 @@ class SecretStore(SecretStoreBase):
hashes = []
hashes.append(
subprocess.run(
nix_shell(
nix_shell_legacy(
["nixpkgs#git"],
[
"git",
@@ -71,7 +71,7 @@ class SecretStore(SecretStoreBase):
if symlink.is_symlink():
hashes.append(
subprocess.run(
nix_shell(
nix_shell_legacy(
["nixpkgs#git"],
[
"git",