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

Fix(tests/templates): add narHash to allow local tests execution in devShell

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-06-10 12:33:22 +02:00
parent c8c2730ddd
commit afc441c376
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/clan-cli/clan_cli/tests/fixtures_flakes.py
View File

@@ -54,13 +54,22 @@ def substitute(
for line in f: for line in f:
line = line.replace("__NIXPKGS__", str(nixpkgs_source())) line = line.replace("__NIXPKGS__", str(nixpkgs_source()))
if clan_core_flake: if clan_core_flake:
line = line.replace("__CLAN_CORE__", f"path:{clan_core_flake}") _flake = Flake(str(clan_core_flake))
_flake.prefetch()
assert _flake.hash, "Clan core flake hash is empty"
assert _flake.store_path, "Clan core flake store path is empty"
line = line.replace( line = line.replace(
"git+https://git.clan.lol/clan/clan-core", f"path:{clan_core_flake}" "__CLAN_CORE__", f"path:{_flake.store_path}?narHash={_flake.hash}"
)
line = line.replace(
"git+https://git.clan.lol/clan/clan-core",
f"path:{_flake.store_path}?narHash={_flake.hash}",
) )
line = line.replace( line = line.replace(
"https://git.clan.lol/clan/clan-core/archive/main.tar.gz", "https://git.clan.lol/clan/clan-core/archive/main.tar.gz",
f"path:{clan_core_flake}", f"path:{_flake.store_path}?narHash={_flake.hash}",
) )
line = line.replace("__INVENTORY_EXPR__", str(inventory_expr)) line = line.replace("__INVENTORY_EXPR__", str(inventory_expr))
line = line.replace("__CLAN_SOPS_KEY_PATH__", sops_key) line = line.replace("__CLAN_SOPS_KEY_PATH__", sops_key)
@@ -122,10 +131,13 @@ class ClanFlake:
self._flake_template = flake_template self._flake_template = flake_template
self.inventory = nested_dict() self.inventory = nested_dict()
self.machines = nested_dict() self.machines = nested_dict()
clan_core_flake = Flake(str(CLAN_CORE))
clan_core_flake.prefetch()
self.substitutions: dict[str, str] = { self.substitutions: dict[str, str] = {
"git+https://git.clan.lol/clan/clan-core": "path://" + str(CLAN_CORE), "git+https://git.clan.lol/clan/clan-core": f"path://{clan_core_flake.store_path}?narHash={clan_core_flake.hash}",
"https://git.clan.lol/clan/clan-core/archive/main.tar.gz": "path://" "https://git.clan.lol/clan/clan-core/archive/main.tar.gz": f"path://{clan_core_flake.store_path}?narHash={clan_core_flake.hash}",
+ str(CLAN_CORE),
} }
self.clan_modules: list[str] = [] self.clan_modules: list[str] = []
self.temporary_home = temporary_home self.temporary_home = temporary_home