diff --git a/flake.nix b/flake.nix index 593ee8f..a158f9c 100644 --- a/flake.nix +++ b/flake.nix @@ -139,11 +139,8 @@ }; packages = - inputs.flake-utils.lib.flattenTree { inherit (pkgs) kubernetes kubectl; - } - // { default = pkgs.callPackage ./pkgs/kubenix.nix { inherit (self.packages.${system}); evalModules = self.evalModules.${system}; @@ -161,9 +158,8 @@ .options; }; } - // import ./jobs { - inherit pkgs; - }; + // pkgs.lib.attrsets.mapAttrs' (name: value: pkgs.lib.attrsets.nameValuePair "generate-${name}" value) + (builtins.removeAttrs (pkgs.callPackage ./pkgs/generators {}) ["override" "overrideDerivation"]); checks = let wasSuccess = suite: diff --git a/jobs/default.nix b/jobs/default.nix deleted file mode 100644 index 1191dfe..0000000 --- a/jobs/default.nix +++ /dev/null @@ -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"]) - ) diff --git a/jobs/generators/default.nix b/pkgs/generators/default.nix similarity index 100% rename from jobs/generators/default.nix rename to pkgs/generators/default.nix diff --git a/jobs/generators/istio/default.nix b/pkgs/generators/istio/default.nix similarity index 100% rename from jobs/generators/istio/default.nix rename to pkgs/generators/istio/default.nix diff --git a/jobs/generators/istio/istio-schema.json b/pkgs/generators/istio/istio-schema.json similarity index 100% rename from jobs/generators/istio/istio-schema.json rename to pkgs/generators/istio/istio-schema.json diff --git a/jobs/generators/k8s/default.nix b/pkgs/generators/k8s/default.nix similarity index 100% rename from jobs/generators/k8s/default.nix rename to pkgs/generators/k8s/default.nix