lib.types.submoduleWith: Interoperate with older version of submoduleWith
This commit is contained in:
parent
8d67bb4aa7
commit
2e485f2581
|
@ -775,9 +775,11 @@ rec {
|
||||||
};
|
};
|
||||||
binOp = lhs: rhs: {
|
binOp = lhs: rhs: {
|
||||||
class =
|
class =
|
||||||
if lhs.class == null then rhs.class
|
# `or null` was added for backwards compatibility only. `class` is
|
||||||
else if rhs.class == null then lhs.class
|
# always set in the current version of the module system.
|
||||||
else if lhs.class == rhs.class then lhs.class
|
if lhs.class or null == null then rhs.class or null
|
||||||
|
else if rhs.class or null == null then lhs.class or null
|
||||||
|
else if lhs.class or null == rhs.class then lhs.class or null
|
||||||
else throw "A submoduleWith option is declared multiple times with conflicting class values \"${toString lhs.class}\" and \"${toString rhs.class}\".";
|
else throw "A submoduleWith option is declared multiple times with conflicting class values \"${toString lhs.class}\" and \"${toString rhs.class}\".";
|
||||||
modules = lhs.modules ++ rhs.modules;
|
modules = lhs.modules ++ rhs.modules;
|
||||||
specialArgs =
|
specialArgs =
|
||||||
|
|
Loading…
Reference in a new issue