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

Merge pull request 'unpin nix-fast-build' (#341) from Mic92-docs into main

Browse Source
This commit is contained in:
clan-bot
2023-09-26 12:02:05 +00:00
parent 11d13cd03f 29a48725ef
commit da1927581d
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/clan-cli/clan_cli/config/__init__.py
View File

@@ -134,19 +134,17 @@ def read_machine_option_value(
clan_dir = get_clan_flake_toplevel() clan_dir = get_clan_flake_toplevel()
# use nix eval to read from .#nixosConfigurations.default.config.{option} # use nix eval to read from .#nixosConfigurations.default.config.{option}
# this will give us the evaluated config with the options attribute # this will give us the evaluated config with the options attribute
proc = subprocess.run( cmd = nix_eval(
nix_eval(
flags=[ flags=[
"--show-trace", "--show-trace",
f"{clan_dir}#nixosConfigurations.{machine_name}.config.{option}", f"{clan_dir}#nixosConfigurations.{machine_name}.config.{option}",
], ],
),
capture_output=True,
text=True,
) )
proc = subprocess.run(cmd, stdout=subprocess.PIPE, text=True)
if proc.returncode != 0: if proc.returncode != 0:
print(proc.stderr, file=sys.stderr) raise ClanError(
raise ClanError(f"Failed to read option {option}:\n{proc.stderr}") f"Failed to read option {option}:\n{shlex.join(cmd)}\nexit with {proc.returncode}"
)
value = json.loads(proc.stdout) value = json.loads(proc.stdout)
# print the value so that the output can be copied and fed as an input. # print the value so that the output can be copied and fed as an input.
# for example a list should be displayed as space separated values surrounded by quotes. # for example a list should be displayed as space separated values surrounded by quotes.