From ef5f5b3c8930b306bef7058ac9a2ed8afb0ed51a Mon Sep 17 00:00:00 2001
From: Bryton Hall <email@bryton.io>
Date: Fri, 7 Jul 2023 17:50:26 -0400
Subject: [PATCH] move generator jobs into pkgs

---
 flake.nix                                         | 8 ++------
 jobs/default.nix                                  | 8 --------
 {jobs => pkgs}/generators/default.nix             | 0
 {jobs => pkgs}/generators/istio/default.nix       | 0
 {jobs => pkgs}/generators/istio/istio-schema.json | 0
 {jobs => pkgs}/generators/k8s/default.nix         | 0
 6 files changed, 2 insertions(+), 14 deletions(-)
 delete mode 100644 jobs/default.nix
 rename {jobs => pkgs}/generators/default.nix (100%)
 rename {jobs => pkgs}/generators/istio/default.nix (100%)
 rename {jobs => pkgs}/generators/istio/istio-schema.json (100%)
 rename {jobs => pkgs}/generators/k8s/default.nix (100%)

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