diff --git a/checks/data-mesher/default.nix b/checks/data-mesher/default.nix index 1975df621..029b2277d 100644 --- a/checks/data-mesher/default.nix +++ b/checks/data-mesher/default.nix @@ -11,10 +11,8 @@ { name = "data-mesher"; - clanSettings = { - self = ./.; - }; clan = { + directory = ./.; inventory = { machines = lib.genAttrs machines (_: { }); services = { diff --git a/checks/dummy-inventory-test/default.nix b/checks/dummy-inventory-test/default.nix index 83da56038..bafac94e9 100644 --- a/checks/dummy-inventory-test/default.nix +++ b/checks/dummy-inventory-test/default.nix @@ -7,10 +7,8 @@ # - clan.service modules name = "dummy-inventory-test"; - clanSettings = { - self = ./.; - }; clan = { + directory = ./.; inventory = { machines.peer1 = { }; machines.admin1 = { }; diff --git a/checks/lib/test-inventory.nix b/checks/lib/test-inventory.nix index bbe454dda..60939c13f 100644 --- a/checks/lib/test-inventory.nix +++ b/checks/lib/test-inventory.nix @@ -23,13 +23,6 @@ in type = types.submodule { options = { clan-core = mkOption { default = self; }; - self = mkOption { - default = throw '' - Clan testing: 'clanSettings.self' is required to be set explizitly during testing. - - It is recommended to set 'clanSettings.self' during testing to the directory where the test lives in i.e. './.' - ''; - }; nixpkgs = mkOption { default = self.inputs.nixpkgs; }; nix-darwin = mkOption { default = self.inputs.nix-darwin; }; }; @@ -42,7 +35,6 @@ in specialArgs = { inherit (config.clanSettings) clan-core - self nixpkgs nix-darwin ; @@ -94,5 +86,4 @@ in node.specialArgs.self = self; }; } -)) -# .config.result +)).config.result