From 150b07e405ac36f56980bd4721a911cefc599924 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 29 Apr 2026 23:30:39 -0400 Subject: [PATCH 1/3] kanidm_1_7: drop as eol --- pkgs/servers/kanidm/1_7.nix | 6 ------ pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 6 ------ pkgs/top-level/release.nix | 2 -- 4 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 pkgs/servers/kanidm/1_7.nix diff --git a/pkgs/servers/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix deleted file mode 100644 index c55c98a2d937..000000000000 --- a/pkgs/servers/kanidm/1_7.nix +++ /dev/null @@ -1,6 +0,0 @@ -import ./generic.nix { - version = "1.7.4"; - hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E="; - cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM="; - unsupported = true; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 99ff1f723fae..e25ae37ef3dc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1004,7 +1004,7 @@ mapAliases { kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidm_1_5 = throw "'kanidm_1_5' has been removed as it has reached end of life"; # Added 2026-01-29 kanidm_1_6 = throw "'kanidm_1_6' has been removed as it has reached end of life"; # Added 2026-01-29 - kanidmWithSecretProvisioning = warnAlias "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01 + kanidmWithSecretProvisioning = throw "'kanidmWithSecretProvisioning' was removed. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'."; # Added 2026-04-30 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_5 = throw "'kanidmWithSecretProvisioning_1_5' has been removed as it has reached end of life"; # Added 2026-01-29 kanidmWithSecretProvisioning_1_6 = throw "'kanidmWithSecretProvisioning_1_6' has been removed as it has reached end of life"; # Added 2026-01-29 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f1e58a148d1..93d619269f38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7994,9 +7994,6 @@ with pkgs; inherit ({ - 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; }; @@ -8004,14 +8001,11 @@ with pkgs; kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_9; }; - kanidmWithSecretProvisioning_1_7 = kanidm_1_7.override { enableSecretProvisioning = true; }; kanidmWithSecretProvisioning_1_8 = kanidm_1_8.override { enableSecretProvisioning = true; }; kanidmWithSecretProvisioning_1_9 = kanidm_1_9.override { enableSecretProvisioning = true; }; }) - kanidm_1_7 kanidm_1_8 kanidm_1_9 - kanidmWithSecretProvisioning_1_7 kanidmWithSecretProvisioning_1_8 kanidmWithSecretProvisioning_1_9 ; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 089094edd990..73977c6de777 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -45,8 +45,6 @@ # so users choosing to allow don't have to rebuild them every time. permittedInsecurePackages = [ "olm-3.2.16" # see PR #347899 - "kanidm_1_7-1.7.4" - "kanidmWithSecretProvisioning_1_7-1.7.4" ]; }; From a28c101b834daa7bd8eb8ff2315054431320faad Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 29 Apr 2026 23:30:26 -0400 Subject: [PATCH 2/3] kanidm_1_8: mark unsupported --- pkgs/servers/kanidm/1_8.nix | 2 +- pkgs/top-level/release.nix | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/kanidm/1_8.nix b/pkgs/servers/kanidm/1_8.nix index d6ddaba4ba09..27af30550891 100644 --- a/pkgs/servers/kanidm/1_8.nix +++ b/pkgs/servers/kanidm/1_8.nix @@ -2,5 +2,5 @@ import ./generic.nix { version = "1.8.6"; hash = "sha256-+NZs8HHHmWGmlNNymIlbV7E28RiaGLmvtZkCWZJQvMk="; cargoHash = "sha256-NKCQRIxvWAT5saMO85noYZtm7h0OPFhWFqudvkQPYTE="; - eolDate = "2026-03-16"; + unsupported = true; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 73977c6de777..4c02d11a9169 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -45,6 +45,8 @@ # so users choosing to allow don't have to rebuild them every time. permittedInsecurePackages = [ "olm-3.2.16" # see PR #347899 + "kanidm_1_8-1.8.6" + "kanidmWithSecretProvisioning_1_8-1.8.6" ]; }; From 0f7bf7bc18485b8dbd26d5802231f39e8582d7ee Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Wed, 29 Apr 2026 23:30:26 -0400 Subject: [PATCH 3/3] kanidm_1_9: 1.9.2 -> 1.9.3 Changelog: https://github.com/kanidm/kanidm/releases/tag/v1.9.3 --- pkgs/servers/kanidm/1_9.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/kanidm/1_9.nix b/pkgs/servers/kanidm/1_9.nix index dd0877813c1e..2952a9f73a67 100644 --- a/pkgs/servers/kanidm/1_9.nix +++ b/pkgs/servers/kanidm/1_9.nix @@ -1,5 +1,5 @@ import ./generic.nix { - version = "1.9.2"; - hash = "sha256-OmUWh60WZ4HH9dFCKiWZ66jMRJx6P003HNWfU0ywIO0="; - cargoHash = "sha256-xQ5FR+GiGZLLEt5GnLnc/vtZdx0YY5hsd06vkF+e6sM="; + version = "1.9.3"; + hash = "sha256-YI2nShQhsCd1vn7S4VeCELfcU0HsmZrFs60kllJJFAo="; + cargoHash = "sha256-b6kBDA/CDJHbybfvbRRZ++q9H+SVRu0BmgkwzN2i/YU="; }