From 99589c1141f6e102bf44fb0035293c3cef19554a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Tue, 8 Apr 2025 17:52:30 +0200 Subject: [PATCH] flake-parts: ensure `flake.darwinConfigurations` is mergeable We didn't run into issues previously for `nixosConfigurations` because there is already a [flake-parts module] that creates the option inside `flake`. [flake-parts module]: https://github.com/hercules-ci/flake-parts/blob/main/modules/nixosConfigurations.nix --- flakeModules/clan.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix index a78ac5aad..21530f0c2 100644 --- a/flakeModules/clan.nix +++ b/flakeModules/clan.nix @@ -44,11 +44,12 @@ in }; }; - options.flake = - flake-parts-lib.mkSubmoduleOptions { + options.flake = flake-parts-lib.mkSubmoduleOptions ( + { clan = lib.mkOption { type = types.raw; }; } - // outputModule.topLevel.options; + // outputModule.topLevel.options + ); config = { flake = { clan = outputModule.clan;