Merge pull request 'clanInternals: remove unused options' (#5206) from module-clan into main

Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/5206

lib/modules/clan/interface.nix

@@ -330,8 +330,6 @@ in
         options = {
           # Those options are interfaced by the CLI
           # We don't specify the type here, for better performance.
-          # clan-core's modules
-          clanModules = lib.mkOption { type = lib.types.raw; };
 
           # The machine 'imports' generated by the inventory per machine
           inventoryClass = lib.mkOption {
@@ -340,12 +338,6 @@ in
             };
           };
 
-          # TODO: remove all dependents in python, delete this option
-          inventory = lib.mkOption {
-            type = lib.types.raw;
-            apply = lib.warn "The 'clanInternals.inventory' option is deprecated, use 'clanInternals.inventoryClass' instead.";
-          };
-
           secrets = lib.mkOption { type = lib.types.raw; };
 
           templates = lib.mkOption { type = lib.types.raw; };

lib/modules/clan/module.nix

@@ -255,10 +255,6 @@ in
           ];
         };
 
-      # TODO: remove this after a month or so
-      # This is here for backwards compatibility for older CLI versions
-      inventory = config.inventory;
-
       # TODO: unify this interface
       # We should have only clan.modules. (consistent with clan.templates)
 

lib/modules/tests.nix

@@ -75,7 +75,7 @@ in
     in
     {
       inherit eval;
-      expr = eval.config.clanInternals.inventory.meta;
+      expr = eval.config.clanInternals.inventoryClass.inventory.meta;
       expected = {
         description = null;
         icon = null;