clan-config: move jsonschema lib to clanLib

This commit is contained in:
DavHau 2023-08-09 12:10:27 +02:00
parent 6b71f0c75e
commit 9438a9eb5f
6 changed files with 22 additions and 20 deletions

View File

@ -1,17 +1,16 @@
{ lib, ... }:
let
clanLib = {
findNixFiles = folder:
lib.mapAttrs'
(name: type:
if
type == "directory"
then
lib.nameValuePair name "${folder}/${name}"
else
lib.nameValuePair (lib.removeSuffix ".nix" name) "${folder}/${name}"
)
(builtins.readDir folder);
};
in
clanLib
{
findNixFiles = folder:
lib.mapAttrs'
(name: type:
if
type == "directory"
then
lib.nameValuePair name "${folder}/${name}"
else
lib.nameValuePair (lib.removeSuffix ".nix" name) "${folder}/${name}"
)
(builtins.readDir folder);
jsonschema = import ./jsonschema.nix { inherit lib; };
}

View File

@ -1,6 +1,7 @@
# !/usr/bin/env python3
import argparse
import json
import os
import subprocess
import sys
from pathlib import Path
@ -8,6 +9,8 @@ from typing import Any, Optional, Type, Union
from clan_cli.errors import ClanError
CLAN_FLAKE = os.getenv("CLAN_FLAKE")
class Kwargs:
def __init__(self) -> None:
@ -27,7 +30,7 @@ def schema_from_module_file(
nix_expr = f"""
let
lib = import <nixpkgs/lib>;
slib = import {__file__}/../schema-lib.nix {{inherit lib;}};
slib = import {CLAN_FLAKE}/lib/jsonschema.nix {{inherit lib;}};
in
slib.parseModule {absolute_path}
"""

View File

@ -9,7 +9,7 @@ let
]
);
checkScript = pkgs.writeScriptBin "check" ''
nix build -f . tests -L "$@"
nix build .#checks.${pkgs.system}.{treefmt,clan-mypy,clan-pytest} -L "$@"
'';
in
pkgs.mkShell {

View File

@ -1,7 +1,7 @@
# tests for the nixos options to jsonschema converter
# run these tests via `nix-unit ./test.nix`
{ lib ? (import <nixpkgs> { }).lib
, slib ? import ../../clan_cli/config/schema-lib.nix { inherit lib; }
, slib ? import ../../../../lib/jsonschema.nix { inherit lib; }
}:
let
description = "Test Description";

View File

@ -1,7 +1,7 @@
# tests for the nixos options to jsonschema converter
# run these tests via `nix-unit ./test.nix`
{ lib ? (import <nixpkgs> { }).lib
, slib ? import ../../clan_cli/config/schema-lib.nix { inherit lib; }
, slib ? import ../../../../lib/jsonschema.nix { inherit lib; }
}:
let
evaledOptions =