diff --git a/lib/default.nix b/lib/default.nix index b609eeb1f..02e35c4c4 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -30,6 +30,6 @@ lib.fix (clanLib: { # Plain imports. values = import ./introspection { inherit lib; }; jsonschema = import ./jsonschema { inherit lib; }; - select = self.inputs.nix-select.lib; + inherit (self.inputs.nix-select.lib) parseSelector applySelectors select; facts = import ./facts.nix { inherit lib; }; }) diff --git a/pkgs/clan-cli/clan_cli/flake.py b/pkgs/clan-cli/clan_cli/flake.py index 065edc1e6..93eb3a83d 100644 --- a/pkgs/clan-cli/clan_cli/flake.py +++ b/pkgs/clan-cli/clan_cli/flake.py @@ -705,7 +705,7 @@ class Flake: flake = builtins.getFlake("path:{self.store_path}?narHash={self.hash}"); in flake.inputs.nixpkgs.legacyPackages.{config["system"]}.writeText "clan-flake-select" ( - builtins.toJSON [ {" ".join([f"(flake.clanInternals.clanLib.select.applySelectors (builtins.fromJSON ''{attr}'') flake)" for attr in str_selectors])} ] + builtins.toJSON [ {" ".join([f"(flake.clanInternals.clanLib.applySelectors (builtins.fromJSON ''{attr}'') flake)" for attr in str_selectors])} ] ) """ if tmp_store := nix_test_store(): diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix index 2a34bfc6e..ce736765c 100644 --- a/pkgs/clan-cli/flake-module.nix +++ b/pkgs/clan-cli/flake-module.nix @@ -86,8 +86,8 @@ # only adding clanCoreWithVendoredDeps to the nix store is not enough templateDerivation = pkgs.closureInfo { rootPaths = - builtins.attrValues (self.clanLib.select.select "clan.templates.clan.*.path" self) - ++ builtins.attrValues (self.clanLib.select.select "clan.templates.machine.*.path" self); + builtins.attrValues (self.clanLib.select "clan.templates.clan.*.path" self) + ++ builtins.attrValues (self.clanLib.select "clan.templates.machine.*.path" self); }; clanCoreWithVendoredDeps =