From d584ab775ca431eef4510ea24f03e143f2422c37 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Thu, 29 Jan 2026 09:29:57 -0500 Subject: [PATCH] kanidm: mark 1.7.x unsupported --- nixos/tests/kanidm-provisioning.nix | 2 +- nixos/tests/kanidm.nix | 2 +- pkgs/servers/kanidm/1_7.nix | 2 +- pkgs/top-level/release.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix index 1c6c6845a74d..5e5a6f0db606 100644 --- a/nixos/tests/kanidm-provisioning.nix +++ b/nixos/tests/kanidm-provisioning.nix @@ -18,7 +18,7 @@ in name = "kanidm-provisioning-${kanidmPackage.version}"; meta.maintainers = with pkgs.lib.maintainers; [ oddlama ]; - _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_7; + _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_8; nodes.provision = { pkgs, lib, ... }: diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix index dcbabe93cb71..b387023e9c88 100644 --- a/nixos/tests/kanidm.nix +++ b/nixos/tests/kanidm.nix @@ -21,7 +21,7 @@ in oddlama ]; - _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_7; + _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_8; nodes.server = { pkgs, ... }: diff --git a/pkgs/servers/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix index b44cfbb3e734..c55c98a2d937 100644 --- a/pkgs/servers/kanidm/1_7.nix +++ b/pkgs/servers/kanidm/1_7.nix @@ -2,5 +2,5 @@ import ./generic.nix { version = "1.7.4"; hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E="; cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM="; - eolDate = "2025-12-12"; + unsupported = true; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2ff584588835..2d0c24ba761b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -44,8 +44,8 @@ # so users choosing to allow don't have to rebuild them every time. permittedInsecurePackages = [ "olm-3.2.16" # see PR #347899 - "kanidm_1_6-1.6.4" - "kanidmWithSecretProvisioning_1_6-1.6.4" + "kanidm_1_7-1.7.4" + "kanidmWithSecretProvisioning_1_7-1.7.4" ]; };