git.delta.rocks / jrsonnet / refs/commits / 16240ebb9bc9

11  inherit (lib.lists) optional;11  inherit (lib.lists) optional;
12  inherit (lib.attrsets) mapAttrs;12  inherit (lib.attrsets) mapAttrs;
13  inherit (lib.modules) mkIf;13  inherit (lib.modules) mkIf;
14  inherit (lib.types) submodule str attrsOf nullOr unspecified lazyAttrsOf;14  inherit (lib.types) submodule str attrsOf nullOr unspecified lazyAttrsOf uniq functionTo package;
15  inherit (fleetLib.strings) decodeRawSecret;15  inherit (fleetLib.strings) decodeRawSecret;
1616
17  sysConfig = config;17  sysConfig = config;
60      };60      };
6161
62      generator = mkOption {62      generator = mkOption {
63        type = nullOr unspecified;63        type = uniq (nullOr (functionTo package));
64        description = "Derivation to evaluate for secret generation";64        description = "Derivation to evaluate for secret generation";
65        default = null;65        default = null;
66      };66      };

--- a/modules/secrets.nix
+++ b/modules/secrets.nix
@@ -4,7 +4,7 @@
   ...
 }: let
   inherit (lib.options) mkOption literalExpression;
-  inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule functionTo package unique;
+  inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule functionTo package uniq;
   inherit (lib.strings) concatStringsSep;
   inherit (lib.attrsets) mapAttrs;
 
@@ -41,7 +41,7 @@
         '';
       };
       generator = mkOption {
-        type = nullOr (unique (functionTo package));
+        type = uniq (nullOr (functionTo package));
         description = ''
           Function evaluating to nix derivation responsible for (re)generating the secret's content.