From 9438a9eb5f14c5ae65d25047fc34c6a0d4ba33f3 Mon Sep 17 00:00:00 2001
From: DavHau <d.hauer.it@gmail.com>
Date: Wed, 9 Aug 2023 12:10:27 +0200
Subject: [PATCH] clan-config: move jsonschema lib to clanLib

---
 lib/default.nix                               | 31 +++++++++----------
 .../schema-lib.nix => lib/jsonschema.nix      |  0
 pkgs/clan-cli/clan_cli/config/__init__.py     |  5 ++-
 pkgs/clan-cli/shell.nix                       |  2 +-
 .../tests/config/test_parseOption.nix         |  2 +-
 .../tests/config/test_parseOptions.nix        |  2 +-
 6 files changed, 22 insertions(+), 20 deletions(-)
 rename pkgs/clan-cli/clan_cli/config/schema-lib.nix => lib/jsonschema.nix (100%)

diff --git a/lib/default.nix b/lib/default.nix
index b0c2432..292d460 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -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; };
+}
diff --git a/pkgs/clan-cli/clan_cli/config/schema-lib.nix b/lib/jsonschema.nix
similarity index 100%
rename from pkgs/clan-cli/clan_cli/config/schema-lib.nix
rename to lib/jsonschema.nix
diff --git a/pkgs/clan-cli/clan_cli/config/__init__.py b/pkgs/clan-cli/clan_cli/config/__init__.py
index 707115e..c36e80c 100644
--- a/pkgs/clan-cli/clan_cli/config/__init__.py
+++ b/pkgs/clan-cli/clan_cli/config/__init__.py
@@ -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}
     """
diff --git a/pkgs/clan-cli/shell.nix b/pkgs/clan-cli/shell.nix
index cc6490a..61a98ff 100644
--- a/pkgs/clan-cli/shell.nix
+++ b/pkgs/clan-cli/shell.nix
@@ -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 {
diff --git a/pkgs/clan-cli/tests/config/test_parseOption.nix b/pkgs/clan-cli/tests/config/test_parseOption.nix
index b3e6173..7ea9276 100644
--- a/pkgs/clan-cli/tests/config/test_parseOption.nix
+++ b/pkgs/clan-cli/tests/config/test_parseOption.nix
@@ -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";
diff --git a/pkgs/clan-cli/tests/config/test_parseOptions.nix b/pkgs/clan-cli/tests/config/test_parseOptions.nix
index 4787d9d..14b8d31 100644
--- a/pkgs/clan-cli/tests/config/test_parseOptions.nix
+++ b/pkgs/clan-cli/tests/config/test_parseOptions.nix
@@ -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 =