From fae8ec318d71e3372f3ee70b6ee74ac2761e6397 Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Wed, 26 Mar 2025 17:08:27 +0100 Subject: [PATCH] feat(inventory/modules): allow inline modules --- lib/inventory/build-inventory/interface.nix | 2 +- lib/inventory/tests/clanModule/README.md | 4 ---- lib/inventory/tests/clanModule/roles/default.nix | 6 ------ lib/inventory/tests/default.nix | 1 - 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 lib/inventory/tests/clanModule/README.md delete mode 100644 lib/inventory/tests/clanModule/roles/default.nix diff --git a/lib/inventory/build-inventory/interface.nix b/lib/inventory/build-inventory/interface.nix index 030da790b..fd5a472c2 100644 --- a/lib/inventory/build-inventory/interface.nix +++ b/lib/inventory/build-inventory/interface.nix @@ -103,7 +103,7 @@ in default = options; }; modules = lib.mkOption { - type = types.attrsOf types.path; + type = types.attrsOf (types.either types.path types.deferredModule); default = { }; defaultText = "clanModules of clan-core"; description = '' diff --git a/lib/inventory/tests/clanModule/README.md b/lib/inventory/tests/clanModule/README.md deleted file mode 100644 index aa87ee5c8..000000000 --- a/lib/inventory/tests/clanModule/README.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -features = [ "inventory" ] ---- -Description \ No newline at end of file diff --git a/lib/inventory/tests/clanModule/roles/default.nix b/lib/inventory/tests/clanModule/roles/default.nix deleted file mode 100644 index 6d0c67be4..000000000 --- a/lib/inventory/tests/clanModule/roles/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ ... }: -{ - _class = "clan"; - perInstance = { }; - perService = { }; -} diff --git a/lib/inventory/tests/default.nix b/lib/inventory/tests/default.nix index 87cc3e9b5..6656e7fcb 100644 --- a/lib/inventory/tests/default.nix +++ b/lib/inventory/tests/default.nix @@ -2,7 +2,6 @@ let inventory = ( import ../build-inventory { - inherit lib clan-core; } );