From e286c9b0e8a1044a66c691080905f6722dea907e Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 12 Feb 2019 16:21:58 +0100 Subject: [PATCH] feat(default): allow to pass args to evalKubernetesModules and buildResources --- default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/default.nix b/default.nix index 9a9ad2a..e090ba3 100644 --- a/default.nix +++ b/default.nix @@ -3,26 +3,25 @@ let lib' = lib.extend (lib: self: import ./lib.nix { inherit lib pkgs; }); - specialArgs = { + specialArgs' = { inherit kubenix; }; - evalKubernetesModules = configuration: lib'.evalModules rec { - modules = [ - configuration - ]; + evalKubernetesModules = {module ? null, modules ? [module], specialArgs ? specialArgs', ...}@attrs: let + attrs' = lib.filterAttrs (n: _: n != "module") attrs; + in lib'.evalModules (attrs' // { + inherit specialArgs modules; args = { inherit pkgs; name = "default"; }; - inherit specialArgs; - }; + }); - buildResources = configuration: - (evalKubernetesModules configuration).config.kubernetes.generated; + buildResources = args: + (evalKubernetesModules args).config.kubernetes.generated; kubenix = { - inherit buildResources kubenix; + inherit evalKubernetesModules buildResources kubenix; lib = lib'; submodules = ./submodules.nix;