lib.types.attrsOf: deduplicate

lib/options.nix

@@ -432,7 +432,7 @@ rec {
  showOption = parts: let
  # If the part is a named placeholder of the form "<...>" don't escape it.
  # Required for compatibility with: namedAttrsOf
- # Can lead to wrong escaping if somebody uses literally "<...>" in their option names.
+ # Can lead to misleading escaping if somebody uses literally "<...>" in their option names.
  # This is the trade-off to allow for named placeholders in option names.
  isNamedPlaceholder = builtins.match "\<(.*)\>";
  escapeOptionPart = part:

lib/types.nix

@@ -568,24 +568,7 @@ rec {
  substSubModules = m: nonEmptyListOf (elemType.substSubModules m);
  };
 
- attrsOf = elemType: mkOptionType rec {
- name = "attrsOf";
- description = "attribute set of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
- descriptionClass = "composite";
- check = isAttrs;
- merge = loc: defs:
- mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
- (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue
- )
- # Push down position info.
- (map (def: mapAttrs (n: v: { inherit (def) file; value = v; }) def.value) defs)));
- emptyValue = { value = {}; };
- getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
- getSubModules = elemType.getSubModules;
- substSubModules = m: attrsOf (elemType.substSubModules m);
- functor = (defaultFunctor name) // { wrapped = elemType; };
- nestedTypes.elemType = elemType;
- };
+ attrsOf = namedAttrsOf "name";
 
  # A version of attrsOf that's lazy in its values at the expense of
  # conditional definitions not working properly. E.g. defining a value with