clan-config: use pinned nixpkgs + fix test flake
This commit is contained in:
@@ -6,7 +6,7 @@ from typing import Optional
|
|||||||
|
|
||||||
from fastapi import HTTPException
|
from fastapi import HTTPException
|
||||||
|
|
||||||
from clan_cli.dirs import get_clan_flake_toplevel
|
from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs
|
||||||
from clan_cli.machines.folders import machine_folder, machine_settings_file
|
from clan_cli.machines.folders import machine_folder, machine_settings_file
|
||||||
|
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ def set_config_for_machine(machine_name: str, config: dict) -> None:
|
|||||||
def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
|
def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
|
||||||
if flake is None:
|
if flake is None:
|
||||||
flake = get_clan_flake_toplevel()
|
flake = get_clan_flake_toplevel()
|
||||||
# use nix eval to lib.evalModules .#clanModules.machine-{machine_name}
|
# use nix eval to lib.evalModules .#nixosModules.machine-{machine_name}
|
||||||
proc = subprocess.run(
|
proc = subprocess.run(
|
||||||
[
|
[
|
||||||
"nix",
|
"nix",
|
||||||
@@ -54,8 +54,8 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
|
|||||||
f"""
|
f"""
|
||||||
let
|
let
|
||||||
flake = builtins.getFlake (toString {flake});
|
flake = builtins.getFlake (toString {flake});
|
||||||
lib = flake.inputs.nixpkgs.lib;
|
lib = import {nixpkgs()}/lib;
|
||||||
module = builtins.trace (builtins.attrNames flake) flake.clanModules.machine-{machine_name};
|
module = builtins.trace (builtins.attrNames flake) flake.nixosModules.machine-{machine_name};
|
||||||
evaled = lib.evalModules {{
|
evaled = lib.evalModules {{
|
||||||
modules = [module];
|
modules = [module];
|
||||||
}};
|
}};
|
||||||
|
|||||||
@@ -5,6 +5,6 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
outputs = _inputs: {
|
outputs = _inputs: {
|
||||||
clanModules.machine-machine1 = ./clanModules/machine1.nix;
|
nixosModules.machine-machine1 = ./nixosModules/machine1.nix;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user