Skip to content

Commit

Permalink
move default for exportedOverrides out of the option decl
Browse files Browse the repository at this point in the history
  • Loading branch information
tek committed Jul 29, 2023
1 parent 7016806 commit fa6af31
Showing 1 changed file with 12 additions and 6 deletions.
18 changes: 12 additions & 6 deletions modules/overrides.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
);

}

0 comments on commit fa6af31

Please sign in to comment.