From b826b4502ccb24829a823c24335196170a405150 Mon Sep 17 00:00:00 2001 From: Bryton Hall Date: Mon, 15 Aug 2022 00:56:01 -0400 Subject: [PATCH] fix nested job generators packages --- CONTRIBUTING.md | 2 +- README.md | 1 + jobs/default.nix | 11 ++++++++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99ddebf..022f2ef 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,7 +33,7 @@ To support a new Kubernetes version: - Build and copy the updated specs to [`modules/generated/`](./modules/generated/) - nix build '.#generators.k8s' + nix build '.#generate-k8s' cp ./result/* modules/generated/ ## Tests diff --git a/README.md b/README.md index 27359df..dede9b5 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ Or, if you're not using flakes, a `default.nix` file (build with `nix-build`): Either way the JSON manifests will be written to `./result`. +See [./docs/examples](./docs/examples) for more. ## Attribution diff --git a/jobs/default.nix b/jobs/default.nix index a855c7f..1191dfe 100644 --- a/jobs/default.nix +++ b/jobs/default.nix @@ -1,3 +1,8 @@ -{pkgs}: { - generators = pkgs.callPackage ./generators {}; -} +{pkgs}: let + sets = pkgs.lib.attrsets; +in + {} + // ( + sets.mapAttrs' (name: value: sets.nameValuePair "generate-${name}" value) + (builtins.removeAttrs (pkgs.callPackage ./generators {}) ["override" "overrideDerivation"]) + )