Skip to content

Commit 1b6e64e

Browse files
committed
Add mkEnv parameter libOverlay to extend lib
Feature discussed in #20
1 parent 6e20193 commit 1b6e64e

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

flake.nix

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
modules ? [],
2828
extraSpecialArgs ? {},
2929
charts ? {},
30+
libOverlay ? null,
3031
}:
3132
import ./modules {
32-
inherit pkgs lib extraSpecialArgs kubenix;
33+
inherit pkgs lib extraSpecialArgs kubenix libOverlay;
3334
kubelib = nix-kube-generators;
3435
modules =
3536
modules
@@ -47,11 +48,12 @@
4748
extraSpecialArgs ? {},
4849
envs ? {},
4950
charts ? {},
51+
libOverlay ? null,
5052
}:
5153
lib.mapAttrs (
5254
env: conf:
5355
mkEnv {
54-
inherit pkgs lib charts;
56+
inherit pkgs lib charts libOverlay;
5557
extraSpecialArgs = extraSpecialArgs // (conf.extraSpecialArgs or {});
5658
modules =
5759
[{nixidy.target.rootPath = lib.mkDefault "./manifests/${env}";}]

modules/default.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
kubenix,
66
lib ? pkgs.lib,
77
extraSpecialArgs ? {},
8+
libOverlay ? null,
89
}: let
910
extendedLib = import ../lib {inherit pkgs kubelib;};
1011

@@ -25,7 +26,10 @@
2526
specialArgs =
2627
{
2728
inherit pkgs;
28-
lib = extendedLib;
29+
lib =
30+
if builtins.isFunction libOverlay
31+
then extendedLib.extend libOverlay
32+
else extendedLib;
2933
}
3034
// extraSpecialArgs;
3135
};

0 commit comments

Comments
 (0)