difftreelog
fix pass v2 coherency check
in: trunk
2 files changed
lib/default.nixdiffbeforeafterboth17 overlay = mkOptionType {17 overlay = mkOptionType {18 name = "nixpkgs-overlay";18 name = "nixpkgs-overlay";19 description = "nixpkgs overlay";19 description = "nixpkgs overlay";20 check = isFunction;20 check = {21 __functor = _self: isFunction;22 isV2MergeCoherent = true;23 };21 merge = mergeOneOption;24 merge = mergeOneOption;22 };25 };23 listOfOverlay = listOf types.overlay;26 listOfOverlay = listOf types.overlay;modules/secrets-data.nixdiffbeforeafterboth--- a/modules/secrets-data.nix
+++ b/modules/secrets-data.nix
@@ -115,8 +115,7 @@
};
in
{
- options.data = mkDataOption (
- { config, ... }:
+ options.data = mkDataOption ({ config, ... }:
{
options = {
managerKeys = mkOption {
@@ -143,8 +142,7 @@
toHostSecret = _: secret: (removeAttrs secret [ "owners" ]) // { shared = true; };
in
genAttrs hostsWithSharedSecrets (host: mapAttrs toHostSecret (secretsHavingHost host));
- }
- );
+ });
config = {
assertions =
(mapAttrsToList (name: secret: {