Regenerated
This commit is contained in:
1 parent
68a9a83ff5
commit
d4dbe5069a
3 files changed
+309
-309
No files matched your search
+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
|
||||
#########################################################
|
||||
mergedHmUsers = lib.mkMerge (
|
||||
builtins.filter (x: builtins.typeOf x == "attrset") (
|
||||
builtins.concatLists (
|
||||
map (m:
|
||||
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||
then m.args.hmUsers
|
||||
else {}
|
||||
then [ m.args.hmUsers ] # wrap in singleton list
|
||||
else []
|
||||
) allModules
|
||||
)
|
||||
);
|
||||
|
||||
@@ -15,11 +15,11 @@ let
|
||||
# Merge all _module.args.hmUsers safely
|
||||
#########################################################
|
||||
mergedHmUsers = lib.mkMerge (
|
||||
builtins.filter (x: builtins.typeOf x == "attrset") (
|
||||
builtins.concatLists (
|
||||
map (m:
|
||||
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||
then m.args.hmUsers
|
||||
else {}
|
||||
then [ m.args.hmUsers ] # wrap in singleton list
|
||||
else []
|
||||
) allModules
|
||||
)
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user