lib/modules: rename defs''' into human friendly names (#445593)

This commit is contained in:
Robert Hensing
2025-09-24 09:29:02 +00:00
committed by GitHub

View File

@@ -1131,7 +1131,7 @@ let
defsFinal' = defsFinal' =
let let
# Process mkMerge and mkIf properties. # Process mkMerge and mkIf properties.
defs' = concatMap ( defsNormalized = concatMap (
m: m:
map ( map (
value: value:
@@ -1146,19 +1146,19 @@ let
) defs; ) defs;
# Process mkOverride properties. # Process mkOverride properties.
defs'' = filterOverrides' defs'; defsFiltered = filterOverrides' defsNormalized;
# Sort mkOrder properties. # Sort mkOrder properties.
defs''' = defsSorted =
# Avoid sorting if we don't have to. # Avoid sorting if we don't have to.
if any (def: def.value._type or "" == "order") defs''.values then if any (def: def.value._type or "" == "order") defsFiltered.values then
sortProperties defs''.values sortProperties defsFiltered.values
else else
defs''.values; defsFiltered.values;
in in
{ {
values = defs'''; values = defsSorted;
inherit (defs'') highestPrio; inherit (defsFiltered) highestPrio;
}; };
defsFinal = defsFinal'.values; defsFinal = defsFinal'.values;