From 3748efa2952f39c1433bf828efd76f16c63309d0 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Tue, 15 Apr 2025 00:34:36 +0200 Subject: [PATCH] fix(keys): unique is not in extra anymore --- lib/keys/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/keys/default.nix b/lib/keys/default.nix index d18907f..5b508b4 100644 --- a/lib/keys/default.nix +++ b/lib/keys/default.nix @@ -7,7 +7,7 @@ { meta, lib }: let - inherit (lib.extra) setDefault unique; + inherit (lib.extra) setDefault; getAttr = lib.flip builtins.getAttr; in @@ -33,14 +33,14 @@ rec { getNodeAdmins = node: meta.organization.groups.root ++ meta.nodes.${node}.admins; # All keys needed for secret encryption - getSecretKeys = node: unique (getMemberKeys (getNodeAdmins node) ++ getNodeKeys [ node ]); + getSecretKeys = node: lib.unique (getMemberKeys (getNodeAdmins node) ++ getNodeKeys [ node ]); # List of keys for all machines wide secrets machineKeys = rootKeys ++ (getNodeKeys (builtins.attrNames meta.nodes)); - mkSecrets = nodes: setDefault { publicKeys = unique (builtins.concatMap getSecretKeys nodes); }; + mkSecrets = nodes: setDefault { publicKeys = lib.unique (builtins.concatMap getSecretKeys nodes); }; - mkRootSecrets = setDefault { publicKeys = unique rootKeys; }; + mkRootSecrets = setDefault { publicKeys = lib.unique rootKeys; }; machineKeysBySystem = system: