ref: streamline kubenix pkg

This commit is contained in:
David Arnold 2021-05-28 16:20:18 -05:00
parent caafa96bd3
commit fc47e41697
No known key found for this signature in database
GPG key ID: 6D6A936E69C59D08
2 changed files with 13 additions and 24 deletions

View file

@ -1,18 +1,16 @@
let
fetch = import ./lib/compat.nix;
in
{ pkgs ? import (fetch "nixpkgs") { }
, nixosPath ? toString (fetch "nixpkgs") + "/nixos"
, lib ? pkgs.lib
}:
{ pkgs, lib }:
with lib;
let
kubenixLib = import ./lib { inherit lib pkgs; };
lib' = lib.extend (lib: self: import ./lib/extra.nix { inherit lib pkgs; });
kubenix = {
inherit evalModules;
lib = import ./lib { inherit lib pkgs; };
modules = import ./modules;
};
defaultSpecialArgs = {
inherit kubenix nixosPath;
inherit kubenix;
nixosPath = pkgs.path + "/nixos";
};
# evalModules with same interface as lib.evalModules and kubenix as
@ -24,9 +22,10 @@ let
, ...
}@attrs:
let
attrs' = filterAttrs (n: _: n != "module") attrs;
lib' = lib.extend (lib: self: import ./lib/extra.nix { inherit lib pkgs; });
attrs' = lib.filterAttrs (n: _: n != "module") attrs;
in
lib'.evalModules (recursiveUpdate
lib'.evalModules (lib.recursiveUpdate
{
inherit specialArgs modules;
args = {
@ -35,13 +34,5 @@ let
};
}
attrs');
modules = import ./modules;
kubenix = {
inherit evalModules modules;
lib = kubenixLib;
};
in
kubenix