technofab/kubenix
1
0
Fork 0
mirror of https://github.com/TECHNOFAB11/kubenix.git synced 2025-12-12 16:10:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ref: streamline kubenix pkg

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

33
default.nix
View file

@ -1,18 +1,16 @@
let { pkgs, lib }:
fetch = import ./lib/compat.nix;
in
{ pkgs ? import (fetch "nixpkgs") { }
, nixosPath ? toString (fetch "nixpkgs") + "/nixos"
, lib ? pkgs.lib
}:
with lib;
let 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 = { defaultSpecialArgs = {
inherit kubenix nixosPath; inherit kubenix;
nixosPath = pkgs.path + "/nixos";
}; };
# evalModules with same interface as lib.evalModules and kubenix as # evalModules with same interface as lib.evalModules and kubenix as
@ -24,9 +22,10 @@ let
, ... , ...
}@attrs: }@attrs:
let 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 in
lib'.evalModules (recursiveUpdate lib'.evalModules (lib.recursiveUpdate
{ {
inherit specialArgs modules; inherit specialArgs modules;
args = { args = {
@ -35,13 +34,5 @@ let
}; };
} }
attrs'); attrs');
modules = import ./modules;
kubenix = {
inherit evalModules modules;
lib = kubenixLib;
};
in in
kubenix kubenix

4
flake.nix
View file

@ -47,9 +47,7 @@
) // ) //
{ {
overlay = final: prev: { overlay = final: prev: {
kubenix = prev.callPackage ./default.nix { kubenix = prev.callPackage ./default.nix { };
nixosPath = "${nixpkgs}/nixos";
};
# up to date versions of their nixpkgs equivalents # up to date versions of their nixpkgs equivalents
kubernetes = prev.callPackage ./pkgs/applications/networking/cluster/kubernetes kubernetes = prev.callPackage ./pkgs/applications/networking/cluster/kubernetes
{ }; { };