From 2ebeb2e205959b669993e1348ec94fc2c8804dfe Mon Sep 17 00:00:00 2001 From: Johannes Kirschbauer Date: Mon, 30 Jun 2025 16:11:55 +0200 Subject: [PATCH] clanLib: remove select --- lib/default.nix | 4 ---- pkgs/clan-cli/flake-module.nix | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/default.nix b/lib/default.nix index 26de72211..e0ebc4303 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -46,9 +46,5 @@ lib.fix ( flakes = clanLib.callLib ./flakes.nix { clan-core = self; }; - - # deprecated - # remove when https://git.clan.lol/clan/clan-core/pulls/3212 is implemented - inherit (self.inputs.nix-select.lib) select; } ) diff --git a/pkgs/clan-cli/flake-module.nix b/pkgs/clan-cli/flake-module.nix index fe950642c..608523f6a 100644 --- a/pkgs/clan-cli/flake-module.nix +++ b/pkgs/clan-cli/flake-module.nix @@ -31,8 +31,8 @@ # only adding clanCoreWithVendoredDeps to the nix store is not enough templateDerivation = pkgs.closureInfo { rootPaths = - builtins.attrValues (self.clanLib.select "clan.templates.clan.*.path" self) - ++ builtins.attrValues (self.clanLib.select "clan.templates.machine.*.path" self); + builtins.attrValues (self.inputs.nix-select.lib.select "clan.templates.clan.*.path" self) + ++ builtins.attrValues (self.inputs.nix-select.lib.select "clan.templates.machine.*.path" self); }; in {