gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kanidm: remove unversioned alias and old versions (#485066)

Browse Source
This commit is contained in:
Adam C. Stephens
2026-01-29 18:52:58 +00:00
committed by GitHub
parent a7b1f1349a 4e4dd876a9
commit c942ad0dd2
10 changed files with 16 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/services/security/kanidm.nix
+3 -12
View File
@@ -238,8 +238,8 @@ in
enablePam = mkEnableOption "the Kanidm PAM and NSS integration";
package = mkPackageOption pkgs "kanidm" {
example = "kanidm_1_4";
extraDescription = "If not set will receive a specific version based on stateVersion. Set to `pkgs.kanidm` to always receive the latest version, with the understanding that this could introduce breaking changes.";
example = "kanidm_1_8";
extraDescription = "Must be set to an explicit version.";
};
serverSettings = mkOption {
@@ -874,16 +874,6 @@ in
)
);
services.kanidm.package =
let
pkg =
if lib.versionAtLeast config.system.stateVersion "24.11" then
pkgs.kanidm_1_4
else
lib.warn "No default kanidm package found for stateVersion = '${config.system.stateVersion}'. Using unpinned version. Consider setting `services.kanidm.package = pkgs.kanidm_1_x` to avoid upgrades introducing breaking changes." pkgs.kanidm;
in
lib.mkDefault pkg;
environment.systemPackages = mkIf cfg.enableClient [ cfg.package ];
systemd.tmpfiles.settings."10-kanidm" = mkIf enableServerBackup {
@@ -1080,6 +1070,7 @@ in
};
meta.maintainers = with lib.maintainers; [
adamcstephens
Flakebi
oddlama
];
nixos/tests/kanidm-provisioning.nix
+1 -1
View File
@@ -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, ... }:
nixos/tests/kanidm.nix
+2 -1
View File
@@ -17,11 +17,12 @@ in
{
name = "kanidm-${kanidmPackage.version}";
meta.maintainers = with pkgs.lib.maintainers; [
adamcstephens
Flakebi
oddlama
];
_module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_7;
_module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_8;
nodes.server =
{ pkgs, ... }:
pkgs/servers/kanidm/1_5.nix
-6
View File
@@ -1,6 +0,0 @@
import ./generic.nix {
version = "1.5.0";
hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
unsupported = true;
}
pkgs/servers/kanidm/1_6.nix
-6
View File
@@ -1,6 +0,0 @@
import ./generic.nix {
version = "1.6.4";
hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";
cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";
unsupported = true;
}
pkgs/servers/kanidm/1_7.nix
+1 -1
View File
@@ -2,5 +2,5 @@ import ./generic.nix {
version = "1.7.4";
hash = "sha256-nWwwcRmCfKJECYN/5w30W3sDu9BqIGonF4ke8F04x3E=";
cargoHash = "sha256-h5jeQxvYzHRVfNYYh9qKukE4h4nhDyuRou2xuZq4AdM=";
eolDate = "2025-12-12";
unsupported = true;
}
pkgs/servers/kanidm/README.md
+2 -6
View File
@@ -20,13 +20,9 @@ For example, when upgrading from 1.4 -> 1.5
1. Update `1_5.nix` hashes/paths, and as needed for upstream changes, `generic.nix`
1. Update `all-packages.nix` to add `kanidm_1_5` and `kanidmWithSecretProvisioning_1_5`, leave default
1. Update the previous release, e.g. `1_4.nix` and set `eolDate = "YYYY-MM-DD"` where the date is 30 days from release of 1.5.
1. Update default in `nixos/tests/kanidm.nix` and `nixos/tests/kanidm-provisioning.nix`
1. Create commit, `kanidm_1_5: init at 1.5.0` - this is the only commit that will be backported
### Update default
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
1. Manually create a backport using _only_ the init commit
@@ -41,5 +37,5 @@ Kanidm versions are supported for 30 days after the release of new versions. Fol
1. Remove the third oldest release from `all-packages.nix`, e.g. 1.3.x continuing the example. Remove `kanidm_1_3` and `kanidmWithSecretProvisioning_1_3`
1. Update `pkgs/top-level/release.nix` and remove `kanidm_1_3*` from `permittedInsecurePackages`
1. Update `pkgs/top-level/aliases.nix` and add `kanidm_1_4` and `kanidmWithSecretProvisioning_1_4-1.4.6`
1. Update `pkgs/top-level/aliases.nix` and add `kanidm_1_4` and `kanidmWithSecretProvisioning_1_4`
1. Remove `pkgs/by-name/ka/kanidm/1_3.nix`
pkgs/top-level/aliases.nix
+5 -1
View File
@@ -885,10 +885,14 @@ mapAliases {
k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
k3s_1_31 = throw "'k3s_1_31' has been removed from nixpkgs as it has reached end of life"; # Added 2025-12-08
kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27
kanidm = warnAlias "'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
kanidm = throw "'kanidm' alias has been removed. You must use a versioned package, e.g. 'kanidm_1_x'."; # Added 2026-01-29
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_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
kapitano = throw "'kapitano' has been removed, as it is unmaintained upstream"; # Added 2025-10-29
kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
pkgs/top-level/all-packages.nix
-12
View File
@@ -8542,12 +8542,6 @@ with pkgs;
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;
};
@@ -8555,17 +8549,11 @@ with pkgs;
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; };
})
kanidm_1_5
kanidm_1_6
kanidm_1_7
kanidm_1_8
kanidmWithSecretProvisioning_1_5
kanidmWithSecretProvisioning_1_6
kanidmWithSecretProvisioning_1_7
kanidmWithSecretProvisioning_1_8
;
pkgs/top-level/release.nix
+2 -2
View File
@@ -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"
];
};