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

clan-cli machines: cache machines_func via store

Browse Source
This commit is contained in:
lassulus
2024-03-01 07:37:47 +01:00
parent 8c7db195ab
commit 108a37b0a3
1 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/clan_cli/machines/machines.py
View File

@@ -166,6 +166,7 @@ class Machine:
config = nix_config() config = nix_config()
system = config["system"] system = config["system"]
file_info = dict()
with NamedTemporaryFile(mode="w") as config_json: with NamedTemporaryFile(mode="w") as config_json:
if extra_config is not None: if extra_config is not None:
json.dump(extra_config, config_json, indent=2) json.dump(extra_config, config_json, indent=2)
@@ -173,13 +174,13 @@ class Machine:
json.dump({}, config_json) json.dump({}, config_json)
config_json.flush() config_json.flush()
nar_hash = json.loads( file_info = json.loads(
run( run(
nix_eval( nix_eval(
[ [
"--impure", "--impure",
"--expr", "--expr",
f'(builtins.fetchTree {{ type = "file"; url = "file://{config_json.name}"; }}).narHash', f'let x = (builtins.fetchTree {{ type = "file"; url = "file://{config_json.name}"; }}); in {{ narHash = x.narHash; path = x.outPath; }}',
] ]
) )
).stdout.strip() ).stdout.strip()
@@ -206,8 +207,8 @@ class Machine:
((builtins.getFlake "{url}").clanInternals.machinesFunc."{system}"."{self.name}" {{ ((builtins.getFlake "{url}").clanInternals.machinesFunc."{system}"."{self.name}" {{
extraConfig = builtins.fromJSON (builtins.readFile (builtins.fetchTree {{ extraConfig = builtins.fromJSON (builtins.readFile (builtins.fetchTree {{
type = "file"; type = "file";
url = if (builtins.compareVersions builtins.nixVersion "2.19") == -1 then "{config_json.name}" else "file:{config_json.name}"; url = if (builtins.compareVersions builtins.nixVersion "2.19") == -1 then "{file_info["path"]}" else "file:{file_info["path"]}";
narHash = "{nar_hash}"; narHash = "{file_info["narHash"]}";
}})); }}));
}}).{attr} }}).{attr}
""", """,