Regenerated
This commit is contained in:
+310
-308
File diff suppressed because it is too large
Load Diff
+10
-8
@@ -142,15 +142,17 @@ let
|
|||||||
allModules = hostModules.imports ++ globalUsers.imports;
|
allModules = hostModules.imports ++ globalUsers.imports;
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Merge all _module.args.hmUsers from modules safely
|
# Merge all _module.args.hmUsers safely
|
||||||
#########################################################
|
#########################################################
|
||||||
mergedHmUsers = lib.mkMerge (map (m:
|
mergedHmUsers = lib.mkMerge (
|
||||||
if builtins.hasAttr "args" m
|
builtins.filter (x: builtins.typeOf x == "attrset") (
|
||||||
&& builtins.hasAttr "hmUsers" m.args
|
map (m:
|
||||||
&& builtins.typeOf m.args.hmUsers == "attrset"
|
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||||
then m.args.hmUsers
|
then m.args.hmUsers
|
||||||
else {}
|
else {}
|
||||||
) allModules);
|
) allModules
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Add activation to ensure all parent directories exist
|
# Add activation to ensure all parent directories exist
|
||||||
|
|||||||
@@ -12,15 +12,17 @@ let
|
|||||||
allModules = hostModules.imports ++ globalUsers.imports;
|
allModules = hostModules.imports ++ globalUsers.imports;
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Merge all _module.args.hmUsers from modules safely
|
# Merge all _module.args.hmUsers safely
|
||||||
#########################################################
|
#########################################################
|
||||||
mergedHmUsers = lib.mkMerge (map (m:
|
mergedHmUsers = lib.mkMerge (
|
||||||
if builtins.hasAttr "args" m
|
builtins.filter (x: builtins.typeOf x == "attrset") (
|
||||||
&& builtins.hasAttr "hmUsers" m.args
|
map (m:
|
||||||
&& builtins.typeOf m.args.hmUsers == "attrset"
|
if builtins.hasAttr "args" m && builtins.hasAttr "hmUsers" m.args
|
||||||
then m.args.hmUsers
|
then m.args.hmUsers
|
||||||
else {}
|
else {}
|
||||||
) allModules);
|
) allModules
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
#########################################################
|
#########################################################
|
||||||
# Add activation to ensure all parent directories exist
|
# Add activation to ensure all parent directories exist
|
||||||
|
|||||||
Reference in New Issue
Block a user