From fa6af3133afd13a82a578cab5411e8446c86ca33 Mon Sep 17 00:00:00 2001 From: Torsten Schmits Date: Sat, 29 Jul 2023 23:55:26 +0200 Subject: [PATCH] move default for exportedOverrides out of the option decl --- modules/overrides.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/modules/overrides.nix b/modules/overrides.nix index d40c0cf..fbe3534 100644 --- a/modules/overrides.nix +++ b/modules/overrides.nix @@ -38,12 +38,7 @@ with lib; Local packages are only propagated when [](#opt-general-depsFull) is used. ''; type = lazyAttrsOf (util.types.cabalOverridesVia config.main); - default = { - local = util.overridesDeps "local" ++ toList config.envs.dev.internal.overridesLocal; - localMin = util.overridesDeps "localMin" ++ toList config.envs.min.internal.overridesLocal; - all = util.overridesDeps "all" ++ toList config.overrides; - dev = util.overridesDeps "dev" ++ toList config.envs.dev.overrides; - } // genAttrs config.ghcVersions (v: util.overridesDeps v ++ toList config.envs.${v}.overrides); + default = {}; }; inheritSystemDependentOverrides = mkOption { @@ -107,4 +102,15 @@ with lib; }; + config.exportedOverrides = mkDefault ( + { + local = util.overridesDeps "local" ++ toList config.envs.dev.internal.overridesLocal; + localMin = util.overridesDeps "localMin" ++ toList config.envs.min.internal.overridesLocal; + all = util.overridesDeps "all" ++ toList config.overrides; + dev = util.overridesDeps "dev" ++ toList config.envs.dev.overrides; + } + // + genAttrs config.ghcVersions (v: util.overridesDeps v ++ toList config.envs.${v}.overrides) + ); + }