Regenerated
This commit is contained in:
+303
-303
File diff suppressed because it is too large
Load Diff
+3
-3
@@ -145,11 +145,11 @@ let
|
|||||||
# Merge all _module.args.hmUsers safely
|
# Merge all _module.args.hmUsers safely
|
||||||
#########################################################
|
#########################################################
|
||||||
mergedHmUsers = lib.mkMerge (
|
mergedHmUsers = lib.mkMerge (
|
||||||
builtins.filter (x: builtins.typeOf x == "attrset") (
|
builtins.concatLists (
|
||||||
map (m:
|
map (m:
|
||||||
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||||
then m.args.hmUsers
|
then [ m.args.hmUsers ] # wrap in singleton list
|
||||||
else {}
|
else []
|
||||||
) allModules
|
) allModules
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -15,11 +15,11 @@ let
|
|||||||
# Merge all _module.args.hmUsers safely
|
# Merge all _module.args.hmUsers safely
|
||||||
#########################################################
|
#########################################################
|
||||||
mergedHmUsers = lib.mkMerge (
|
mergedHmUsers = lib.mkMerge (
|
||||||
builtins.filter (x: builtins.typeOf x == "attrset") (
|
builtins.concatLists (
|
||||||
map (m:
|
map (m:
|
||||||
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||||
then m.args.hmUsers
|
then [ m.args.hmUsers ] # wrap in singleton list
|
||||||
else {}
|
else []
|
||||||
) allModules
|
) allModules
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user