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

difftreelog

fixup nixos generator type

Lach2025-03-23parent: #098319f.patch.diff
in: trunk

2 files changed

modifiedmodules/nixos/secrets.nixdiffbeforeafterboth
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 };
modifiedmodules/secrets.nixdiffbeforeafterboth
4 ...4 ...
5}: let5}: let
6 inherit (lib.options) mkOption literalExpression;6 inherit (lib.options) mkOption literalExpression;
7 inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule functionTo package unique;7 inherit (lib.types) unspecified nullOr listOf str bool attrsOf submodule functionTo package uniq;
8 inherit (lib.strings) concatStringsSep;8 inherit (lib.strings) concatStringsSep;
9 inherit (lib.attrsets) mapAttrs;9 inherit (lib.attrsets) mapAttrs;
1010
41 '';41 '';
42 };42 };
43 generator = mkOption {43 generator = mkOption {
44 type = nullOr (unique (functionTo package));44 type = uniq (nullOr (functionTo package));
45 description = ''45 description = ''
46 Function evaluating to nix derivation responsible for (re)generating the secret's content.46 Function evaluating to nix derivation responsible for (re)generating the secret's content.
4747