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

cli: fix nixpkgs unfree import

Browse Source
This commit is contained in:
Jörg Thalheim
2023-09-06 17:29:49 +02:00
parent 35c5f248d1
commit 3bdd3af248
7 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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, nixpkgs
from clan_cli.dirs import get_clan_flake_toplevel, nixpkgs_source
from clan_cli.machines.folders import machine_folder, machine_settings_file
from clan_cli.nix import nix_eval
@@ -54,7 +54,7 @@ def schema_for_machine(machine_name: str, flake: Optional[Path] = None) -> dict:
f"""
let
flake = builtins.getFlake (toString {flake});
lib = import {nixpkgs()}/lib;
lib = import {nixpkgs_source()}/lib;
options = flake.nixosConfigurations.{machine_name}.options;
clanOptions = options.clan;
jsonschemaLib = import {Path(__file__).parent / "jsonschema"} {{ inherit lib; }};