DavHau/clan-core
1
0
Fork 0
forked from clan/clan-core
Code Pull Requests Activity

Merge pull request 'clan-config: use pinned nixpkgs + fix test flake' (#191) from DavHau-main into main

Browse Source
This commit is contained in:
clan-bot 2023-08-26 21:35:13 +00:00
commit c018301d1c
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clan-cli/clan_cli/config/machine.py
View File

@ -6,7 +6,7 @@ from typing import Optional
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
@ -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:
if flake is None:
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(
[
"nix",
@ -54,8 +54,8 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
f"""
let
flake = builtins.getFlake (toString {flake});
lib = flake.inputs.nixpkgs.lib;
module = builtins.trace (builtins.attrNames flake) flake.clanModules.machine-{machine_name};
lib = import {nixpkgs()}/lib;
module = builtins.trace (builtins.attrNames flake) flake.nixosModules.machine-{machine_name};
evaled = lib.evalModules {{
modules = [module];
}};

2
pkgs/clan-cli/tests/machine_flake/flake.nix
View File

@ -5,6 +5,6 @@
};
outputs = _inputs: {
clanModules.machine-machine1 = ./clanModules/machine1.nix;
nixosModules.machine-machine1 = ./nixosModules/machine1.nix;
};
}

0
pkgs/clan-cli/tests/machine_flake/clanModules/machine1.nix → pkgs/clan-cli/tests/machine_flake/nixosModules/machine1.nix
View File