kanidm: remove unversioned alias and old versions (#485066) (c942ad0d) · Commits · nix / nixpkgs

nixos/modules/services/security/kanidm.nix

+3 −12

Original line number	Diff line number	Diff line
		@@ -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
		];

+1 −1

Original line number	Diff line number	Diff line
		@@ -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, ... }:

+2 −1

Original line number	Diff line number	Diff line
		@@ -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, ... }:

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		import ./generic.nix {
		version = "1.5.0";
		hash = "sha256-swrqyjA7Wgq17vd+753LDFcXrSFixVNLhTvj1bhG3DU=";
		cargoHash = "sha256-72IwS8Nk1y6xDH9y8JW2LpbhFWaq0tpORx7JQSCF5/M=";
		unsupported = true;
		}

deleted100644 → 0

+0 −6

Original line number	Diff line number	Diff line
		import ./generic.nix {
		version = "1.6.4";
		hash = "sha256-ui3w1HDHXHARsjQ3WtJfZbM7Xgg3ODnUneXJMQwaOMw=";
		cargoHash = "sha256-KJGELBzScwsLd6g3GR9Vk0nfDU2EjZBfXwlXJ+bZb1k=";
		unsupported = true;
		}