From 5bd87c113f2c6479a4fab1739aed5f7146f28a8a Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 12 Nov 2025 11:26:55 -0500 Subject: [PATCH] kanidm: appease nixpkgs-vet checks --- pkgs/top-level/all-packages.nix | 44 +++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 16 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ac0fe4965ab1..0f7749110918 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9205,23 +9205,35 @@ with pkgs; jetty = jetty_12; - kanidm_1_5 = callPackage ../servers/kanidm/1_5.nix { - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5; - }; - kanidm_1_6 = callPackage ../servers/kanidm/1_6.nix { - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6; - }; - kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix { - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7; - }; - kanidm_1_8 = callPackage ../servers/kanidm/1_8.nix { - kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8; - }; + inherit + ({ + kanidm_1_5 = callPackage ../servers/kanidm/1_5.nix { + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5; + }; + kanidm_1_6 = callPackage ../servers/kanidm/1_6.nix { + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6; + }; + kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix { + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7; + }; + kanidm_1_8 = callPackage ../servers/kanidm/1_8.nix { + kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_8; + }; - kanidmWithSecretProvisioning_1_5 = kanidm_1_5.override { enableSecretProvisioning = true; }; - kanidmWithSecretProvisioning_1_6 = kanidm_1_6.override { enableSecretProvisioning = true; }; - kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; }; - kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_5 = kanidm_1_5.override { enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_6 = kanidm_1_6.override { enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; }; + kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; }; + }) + kanidm_1_5 + kanidm_1_6 + kanidm_1_7 + kanidm_1_8 + kanidmWithSecretProvisioning_1_5 + kanidmWithSecretProvisioning_1_6 + kanidmWithSecretProvisioning_1_7 + kanidmWithSecretProvisioning_1_8 + ; knot-resolver = callPackage ../servers/dns/knot-resolver { systemd = systemdMinimal; # in closure already anyway