From 1b2fd8d56f282b59668b181147ec67b2120ae30b Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 1 Sep 2025 16:46:54 -0400 Subject: [PATCH 1/2] kanidm_1_6: mark unsupported --- pkgs/by-name/ka/kanidm/1_6.nix | 2 +- pkgs/top-level/release.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ka/kanidm/1_6.nix b/pkgs/by-name/ka/kanidm/1_6.nix index 894accceda72..294e72b4bd15 100644 --- a/pkgs/by-name/ka/kanidm/1_6.nix +++ b/pkgs/by-name/ka/kanidm/1_6.nix @@ -2,5 +2,5 @@ import ./generic.nix { version = "1.6.4"; hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw="; cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k="; - eolDate = "2025-09-01"; + unsupported = true; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index f087876479c8..1171d34793cb 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_5-1.5.0" - "kanidmWithSecretProvisioning_1_5-1.5.0" + "kanidm_1_6-1.6.4" + "kanidmWithSecretProvisioning_1_6-1.6.4" ]; }; From 846873b3d46a7d2a5bb79a5fcf0f066921c957c5 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Mon, 1 Sep 2025 16:57:07 -0400 Subject: [PATCH 2/2] kanidm: update default to 1.7, warn for removal --- pkgs/by-name/ka/kanidm/package.nix | 1 - pkgs/{by-name/ka => servers}/kanidm/1_5.nix | 0 pkgs/{by-name/ka => servers}/kanidm/1_6.nix | 0 pkgs/{by-name/ka => servers}/kanidm/1_7.nix | 0 pkgs/{by-name/ka => servers}/kanidm/README.md | 3 +-- .../kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch | 0 pkgs/{by-name/ka => servers}/kanidm/generic.nix | 0 .../provision-patches/1_5/oauth2-basic-secret-modify.patch | 0 .../kanidm/provision-patches/1_5/recover-account.patch | 0 .../provision-patches/1_6/oauth2-basic-secret-modify.patch | 0 .../kanidm/provision-patches/1_6/recover-account.patch | 0 .../provision-patches/1_7/oauth2-basic-secret-modify.patch | 0 .../kanidm/provision-patches/1_7/recover-account.patch | 0 pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 7 +++---- 15 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 pkgs/by-name/ka/kanidm/package.nix rename pkgs/{by-name/ka => servers}/kanidm/1_5.nix (100%) rename pkgs/{by-name/ka => servers}/kanidm/1_6.nix (100%) rename pkgs/{by-name/ka => servers}/kanidm/1_7.nix (100%) rename pkgs/{by-name/ka => servers}/kanidm/README.md (93%) rename pkgs/{by-name/ka => servers}/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/generic.nix (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_5/recover-account.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_6/recover-account.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch (100%) rename pkgs/{by-name/ka => servers}/kanidm/provision-patches/1_7/recover-account.patch (100%) diff --git a/pkgs/by-name/ka/kanidm/package.nix b/pkgs/by-name/ka/kanidm/package.nix deleted file mode 100644 index a71683505630..000000000000 --- a/pkgs/by-name/ka/kanidm/package.nix +++ /dev/null @@ -1 +0,0 @@ -import ./1_6.nix diff --git a/pkgs/by-name/ka/kanidm/1_5.nix b/pkgs/servers/kanidm/1_5.nix similarity index 100% rename from pkgs/by-name/ka/kanidm/1_5.nix rename to pkgs/servers/kanidm/1_5.nix diff --git a/pkgs/by-name/ka/kanidm/1_6.nix b/pkgs/servers/kanidm/1_6.nix similarity index 100% rename from pkgs/by-name/ka/kanidm/1_6.nix rename to pkgs/servers/kanidm/1_6.nix diff --git a/pkgs/by-name/ka/kanidm/1_7.nix b/pkgs/servers/kanidm/1_7.nix similarity index 100% rename from pkgs/by-name/ka/kanidm/1_7.nix rename to pkgs/servers/kanidm/1_7.nix diff --git a/pkgs/by-name/ka/kanidm/README.md b/pkgs/servers/kanidm/README.md similarity index 93% rename from pkgs/by-name/ka/kanidm/README.md rename to pkgs/servers/kanidm/README.md index b624e8e67ab4..e2902ebd4136 100644 --- a/pkgs/by-name/ka/kanidm/README.md +++ b/pkgs/servers/kanidm/README.md @@ -24,8 +24,7 @@ For example, when upgrading from 1.4 -> 1.5 ### Update default -1. `sed -i 's/1_4/1_5/' pkgs/by-name/ka/kanidm/package.nix` -1. Update `all-packages.nix` and set `kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5;` +1. Update kanidm aliases in `aliases.nix`. Should remove completely after 25.11 branch off. 1. Create commit `kanidm: update default to 1.5.0` ### Backport to stable diff --git a/pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch b/pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch rename to pkgs/servers/kanidm/a3bc718a8a0325a53e0857668b8a0134d371794d.patch diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/servers/kanidm/generic.nix similarity index 100% rename from pkgs/by-name/ka/kanidm/generic.nix rename to pkgs/servers/kanidm/generic.nix diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch b/pkgs/servers/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch rename to pkgs/servers/kanidm/provision-patches/1_5/oauth2-basic-secret-modify.patch diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_5/recover-account.patch b/pkgs/servers/kanidm/provision-patches/1_5/recover-account.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_5/recover-account.patch rename to pkgs/servers/kanidm/provision-patches/1_5/recover-account.patch diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch b/pkgs/servers/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch rename to pkgs/servers/kanidm/provision-patches/1_6/oauth2-basic-secret-modify.patch diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_6/recover-account.patch b/pkgs/servers/kanidm/provision-patches/1_6/recover-account.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_6/recover-account.patch rename to pkgs/servers/kanidm/provision-patches/1_6/recover-account.patch diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch b/pkgs/servers/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch rename to pkgs/servers/kanidm/provision-patches/1_7/oauth2-basic-secret-modify.patch diff --git a/pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch b/pkgs/servers/kanidm/provision-patches/1_7/recover-account.patch similarity index 100% rename from pkgs/by-name/ka/kanidm/provision-patches/1_7/recover-account.patch rename to pkgs/servers/kanidm/provision-patches/1_7/recover-account.patch diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7155fddfd0d3..85148205b335 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1223,6 +1223,8 @@ mapAliases { kube3d = k3d; # Added 2022-0705 kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17 kak-lsp = kakoune-lsp; # Added 2024-04-01 + kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01 + kanidmWithSecretProvisioning = lib.warnOnInstantiate "'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 kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10 kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14b2e04db764..7db752c45abc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9825,17 +9825,16 @@ with pkgs; jetty = jetty_12; - kanidm_1_5 = callPackage ../by-name/ka/kanidm/1_5.nix { + kanidm_1_5 = callPackage ../servers/kanidm/1_5.nix { kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_5; }; - kanidm_1_6 = callPackage ../by-name/ka/kanidm/1_6.nix { + kanidm_1_6 = callPackage ../servers/kanidm/1_6.nix { kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_6; }; - kanidm_1_7 = callPackage ../by-name/ka/kanidm/1_7.nix { + kanidm_1_7 = callPackage ../servers/kanidm/1_7.nix { kanidmWithSecretProvisioning = kanidmWithSecretProvisioning_1_7; }; - kanidmWithSecretProvisioning = kanidm.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; };