misc: refactor helpers propagation

Co-authored-by: Robert Hensing <robert@roberthensing.nl>
This commit is contained in:
Gaetan Lepage 2024-02-07 16:50:08 +01:00 committed by Gaétan Lepage
parent 3bbb3d5453
commit 5d3ed3a09e
12 changed files with 100 additions and 40 deletions

View file

@ -1,6 +1,7 @@
default_pkgs: {
modules,
self,
getHelpers,
}: {
pkgs ? default_pkgs,
extraSpecialArgs ? {},
@ -8,16 +9,24 @@ default_pkgs: {
}: let
inherit (pkgs) lib;
wrap = {wrapRc = true;};
shared = import ./_shared.nix modules {
helpers = getHelpers pkgs;
shared = import ./_shared.nix {inherit modules helpers;} {
inherit pkgs lib;
config = {};
};
eval = lib.evalModules {
modules = [module wrap] ++ shared.topLevelModules;
specialArgs = extraSpecialArgs;
modules =
[
module
{wrapRc = true;}
]
++ shared.topLevelModules;
specialArgs =
{
inherit helpers;
}
// extraSpecialArgs;
};
handleAssertions = config: let