Merge pull request 'flake-parts: ensure flake.darwinConfigurations is mergeable' (#3244) from push-zurymrrrxwur into main
Reviewed-on: https://git.clan.lol/clan/clan-core/pulls/3244
This commit is contained in:
@@ -2,7 +2,6 @@ clan-core:
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
flake-parts-lib,
|
|
||||||
self,
|
self,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
@@ -44,11 +43,10 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
options.flake =
|
options.flake = {
|
||||||
flake-parts-lib.mkSubmoduleOptions {
|
|
||||||
clan = lib.mkOption { type = types.raw; };
|
clan = lib.mkOption { type = types.raw; };
|
||||||
}
|
} // outputModule.topLevel.options;
|
||||||
// outputModule.topLevel.options;
|
|
||||||
config = {
|
config = {
|
||||||
flake = {
|
flake = {
|
||||||
clan = outputModule.clan;
|
clan = outputModule.clan;
|
||||||
|
|||||||
Reference in New Issue
Block a user