diff options
author | tv <tv@krebsco.de> | 2016-06-07 02:15:58 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2016-06-07 02:15:58 +0200 |
commit | 39ebd5001ebcbcc9d991784ec1ce6dd804dbdcd4 (patch) | |
tree | 358a72ed120083a8d882069820350001a0cd8b26 | |
parent | dda2887e2cf618a7c7744bee2eed806e3a38fe36 (diff) |
getAttrDef: RIP
-rw-r--r-- | krebs/4lib/default.nix | 1 | ||||
-rw-r--r-- | krebs/4lib/types.nix | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 585bd313f..e984614a0 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -41,7 +41,6 @@ let out = rec { mapAttrs (name: _: path + "/${name}") (filterAttrs (_: eq "directory") (readDir path)); - getAttrDef = name: set: set.${name} or set.default or null; mapAttrValues = f: mapAttrs (_: f); setAttr = name: value: set: set // { ${name} = value; }; diff --git a/krebs/4lib/types.nix b/krebs/4lib/types.nix index 66191d0b3..f78d601e3 100644 --- a/krebs/4lib/types.nix +++ b/krebs/4lib/types.nix @@ -199,8 +199,9 @@ types // rec { description = '' Set of user's PGP public keys. - Modules supporting PGP may use well-known key names to define option - defaults, e.g. using `getAttrDef well-known-name pubkeys`. + Modules supporting PGP may use well-known key names to define + default values for options, in which case the well-known name + should be documented in the respective option's description. ''; }; pubkey = mkOption { |