diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix index dec466aa..b1a1247a 100644 --- a/flakeModules/clan.nix +++ b/flakeModules/clan.nix @@ -91,6 +91,8 @@ in type = lib.types.submodule { options = { inventory = lib.mkOption { type = lib.types.attrsOf lib.types.unspecified; }; + inventoryFile = lib.mkOption { type = lib.types.unspecified; }; + meta = lib.mkOption { type = lib.types.attrsOf lib.types.unspecified; }; all-machines-json = lib.mkOption { type = lib.types.attrsOf lib.types.unspecified; }; machines = lib.mkOption { type = lib.types.attrsOf (lib.types.attrsOf lib.types.unspecified); }; diff --git a/lib/build-clan/default.nix b/lib/build-clan/default.nix index 9328b460..8861c3f8 100644 --- a/lib/build-clan/default.nix +++ b/lib/build-clan/default.nix @@ -188,7 +188,7 @@ builtins.deepSeq deprecationWarnings { meta = mergedInventory.meta; inventory = mergedInventory; - invFile = "${directory}/inventory.json"; + inventoryFile = "${directory}/inventory.json"; # machine specifics machines = configsPerSystem; diff --git a/templates/flake-module.nix b/templates/flake-module.nix index aa1eaf39..e1c9f774 100644 --- a/templates/flake-module.nix +++ b/templates/flake-module.nix @@ -1,4 +1,4 @@ -{ self, inputs, ... }: +{ self, ... }: { flake.templates = { new-clan = { @@ -15,25 +15,4 @@ path = ./minimal; }; }; - flake.checks.x86_64-linux.template-minimal = - let - path = self.templates.minimal.path; - initialized = inputs.nixpkgs.legacyPackages.x86_64-linux.runCommand "minimal-clan-flake" { } '' - mkdir $out - cp -r ${path}/* $out - mkdir -p $out/machines/foo - echo '{ "nixpkgs": { "hostPlatform": "x86_64-linux" } }' > $out/machines/foo/settings.json - ''; - evaled = (import "${initialized}/flake.nix").outputs { - self = evaled // { - outPath = initialized; - }; - clan-core = self; - }; - in - { - type = "derivation"; - name = "minimal-clan-flake-check"; - inherit (evaled.nixosConfigurations.foo.config.system.build.vm) drvPath outPath; - }; }