From 06e2fcf9fa4c413783325a312edcd3e2bde6d29b Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Sun, 27 Apr 2025 13:10:42 +0200 Subject: [PATCH] refactor: rename clanLib.values to introspection --- lib/build-clan/module.nix | 2 +- lib/default.nix | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/build-clan/module.nix b/lib/build-clan/module.nix index d8924868f..a6a40fde0 100644 --- a/lib/build-clan/module.nix +++ b/lib/build-clan/module.nix @@ -209,7 +209,7 @@ in inherit inventoryFile; inventoryValuesPrios = # Temporary workaround - builtins.removeAttrs (clan-core.clanLib.values.getPrios { options = inventory.options; }) + builtins.removeAttrs (clan-core.clanLib.introspection.getPrios { options = inventory.options; }) # tags are freeformType which is not supported yet. [ "tags" ]; diff --git a/lib/default.nix b/lib/default.nix index 02e35c4c4..cfa151cac 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -28,8 +28,11 @@ lib.fix (clanLib: { test = clanLib.callLib ./test { }; # Plain imports. - values = import ./introspection { inherit lib; }; + introspection = import ./introspection { inherit lib; }; jsonschema = import ./jsonschema { inherit lib; }; - inherit (self.inputs.nix-select.lib) parseSelector applySelectors select; facts = import ./facts.nix { inherit lib; }; + + # Passthrough from self.inputs + # TODO: Can we make these agnostic from the name of the input? + inherit (self.inputs.nix-select.lib) parseSelector applySelectors select; })