Revert "clan-cli: deprecate nix_shell() in favor of run_cmd()"

This reverts commit a598b878a5.
This commit is contained in:
Jörg Thalheim
2024-07-17 14:04:49 +02:00
parent 0518f875cd
commit 64956a7a0a
24 changed files with 116 additions and 104 deletions

View File

@@ -20,7 +20,7 @@ from ..errors import ClanError
from ..git import commit_files
from ..machines.inventory import get_all_machines, get_selected_machines
from ..machines.machines import Machine
from ..nix import run_cmd
from ..nix import nix_shell
from .check import check_secrets
from .public_modules import FactStoreBase
from .secret_modules import SecretStoreBase
@@ -40,10 +40,10 @@ def read_multiline_input(prompt: str = "Finish with Ctrl-D") -> str:
def bubblewrap_cmd(generator: str, generator_dir: Path, dep_tmpdir: Path) -> list[str]:
# fmt: off
return run_cmd(
return nix_shell(
[
"bash",
"bubblewrap",
"nixpkgs#bash",
"nixpkgs#bubblewrap",
],
[
"bwrap",