move generator jobs into pkgs

This commit is contained in:
Bryton Hall 2023-07-07 17:50:26 -04:00
parent 7a64a0f599
commit ef5f5b3c89
6 changed files with 2 additions and 14 deletions

View file

@ -139,11 +139,8 @@
}; };
packages = packages =
inputs.flake-utils.lib.flattenTree
{ {
inherit (pkgs) kubernetes kubectl; inherit (pkgs) kubernetes kubectl;
}
// {
default = pkgs.callPackage ./pkgs/kubenix.nix { default = pkgs.callPackage ./pkgs/kubenix.nix {
inherit (self.packages.${system}); inherit (self.packages.${system});
evalModules = self.evalModules.${system}; evalModules = self.evalModules.${system};
@ -161,9 +158,8 @@
.options; .options;
}; };
} }
// import ./jobs { // pkgs.lib.attrsets.mapAttrs' (name: value: pkgs.lib.attrsets.nameValuePair "generate-${name}" value)
inherit pkgs; (builtins.removeAttrs (pkgs.callPackage ./pkgs/generators {}) ["override" "overrideDerivation"]);
};
checks = let checks = let
wasSuccess = suite: wasSuccess = suite:

View file

@ -1,8 +0,0 @@
{pkgs}: let
sets = pkgs.lib.attrsets;
in
{}
// (
sets.mapAttrs' (name: value: sets.nameValuePair "generate-${name}" value)
(builtins.removeAttrs (pkgs.callPackage ./generators {}) ["override" "overrideDerivation"])
)