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

cli: use nixpkgs in nix shell in pure mode

Browse Source 
This avoids nixpkgs config and overlay provided by the user.
Also enables caching in nix.
This commit is contained in:
Jörg Thalheim
2023-07-26 09:00:28 +02:00
parent 8e7e3845d1
commit 83005a6795
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/clan-cli/clan_cli/nix.py
View File

@@ -6,4 +6,5 @@ def nix_shell(packages: list[str], cmd: list[str]) -> list[str]:
# in unittest we will have all binaries provided # in unittest we will have all binaries provided
if nixpkgs is None: if nixpkgs is None:
return cmd return cmd
return ["nix", "shell", "-f", nixpkgs] + packages + ["-c"] + cmd wrapped_packages = [f"path:{nixpkgs}#{p}" for p in packages]
return ["nix", "shell"] + wrapped_packages + ["-c"] + cmd

14
pkgs/clan-cli/tests/test_clan_ssh.py
View File

@@ -39,10 +39,8 @@ def test_ssh_no_pass(fp: pytest_subprocess.fake_process.FakeProcess) -> None:
cmd: list[Union[str, utils.Any]] = [ cmd: list[Union[str, utils.Any]] = [
"nix", "nix",
"shell", "shell",
"-f", "path:/mocked-nixpkgs#tor",
"/mocked-nixpkgs", "path:/mocked-nixpkgs#openssh",
"tor",
"openssh",
"-c", "-c",
"torify", "torify",
"ssh", "ssh",
@@ -68,11 +66,9 @@ def test_ssh_with_pass(fp: pytest_subprocess.fake_process.FakeProcess) -> None:
cmd: list[Union[str, utils.Any]] = [ cmd: list[Union[str, utils.Any]] = [
"nix", "nix",
"shell", "shell",
"-f", "path:/mocked-nixpkgs#tor",
"/mocked-nixpkgs", "path:/mocked-nixpkgs#openssh",
"tor", "path:/mocked-nixpkgs#sshpass",
"openssh",
"sshpass",
"-c", "-c",
"torify", "torify",
"sshpass", "sshpass",