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

cli: fix installation test with latest release of nixos-anywhere

Browse Source
This commit is contained in:
Michael Hoang
2025-10-13 14:39:52 +02:00
parent 56e03d1f25
commit 46f746d09c
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/clan-cli/clan_lib/machines/hardware.py
View File

@@ -119,6 +119,13 @@ def run_machine_hardware_info_init(
if opts.debug: if opts.debug:
cmd += ["--debug"] cmd += ["--debug"]
# REMOVEME when nixos-anywhere > 1.12.0
# In 1.12.0 and earlier, nixos-anywhere doesn't pass Nix options when attempting to get substituters
# which leads to the installation test failing with the error of not being able to substitute flake-parts
# see: https://github.com/nix-community/nixos-anywhere/pull/596
if "CLAN_TEST_STORE" in environ:
cmd += ["--no-use-machine-substituters"]
# Add nix options to nixos-anywhere # Add nix options to nixos-anywhere
cmd.extend(opts.machine.flake.nix_options or []) cmd.extend(opts.machine.flake.nix_options or [])

7
pkgs/clan-cli/clan_lib/machines/install.py
View File

@@ -191,6 +191,13 @@ def run_machine_install(opts: InstallOptions, target_host: Remote) -> None:
if opts.debug: if opts.debug:
cmd.append("--debug") cmd.append("--debug")
# REMOVEME when nixos-anywhere > 1.12.0
# In 1.12.0 and earlier, nixos-anywhere doesn't pass Nix options when attempting to get substituters
# which leads to the installation test failing with the error of not being able to substitute flake-parts
# see: https://github.com/nix-community/nixos-anywhere/pull/596
if "CLAN_TEST_STORE" in environ:
cmd += ["--no-use-machine-substituters"]
# Add nix options to nixos-anywhere # Add nix options to nixos-anywhere
cmd.extend(opts.machine.flake.nix_options or []) cmd.extend(opts.machine.flake.nix_options or [])