From 29c9fa86b55ff88fbbfe9e7ba5ad5e147a908a60 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 19 May 2025 11:05:10 +0300
Subject: [PATCH 1/2] kanidm: fix running on Linux

---
 pkgs/by-name/ka/kanidm/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/kanidm/generic.nix b/pkgs/by-name/ka/kanidm/generic.nix
index 34e480650086..08ac4c490901 100644
--- a/pkgs/by-name/ka/kanidm/generic.nix
+++ b/pkgs/by-name/ka/kanidm/generic.nix
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
     inherit hash;
   };
 
-  KANIDM_BUILD_PROFILE = "release_nixpgs_${arch}";
+  KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
 
   patches = lib.optionals enableSecretProvisioning [
     "${patchDir}/oauth2-basic-secret-modify.patch"
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
   postPatch =
     let
       format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
-      socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidm/sock" else "/var/run/kanidm.socket";
+      socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket";
       profile =
         {
           cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";

From bf0aa25e4bc0465571e0ab562a8b8188a7c0d81e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 19 May 2025 11:14:40 +0300
Subject: [PATCH 2/2] nixos/tests/kanidm: pin to v1.6

These should really be made versioned, but this gets us _something_
quickly, at least.
---
 nixos/tests/kanidm-provisioning.nix | 2 +-
 nixos/tests/kanidm.nix              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 16e39dba729c..8f0ca0ec0859 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -23,7 +23,7 @@ import ./make-test-python.nix (
       { pkgs, lib, ... }:
       {
         services.kanidm = {
-          package = pkgs.kanidmWithSecretProvisioning;
+          package = pkgs.kanidmWithSecretProvisioning_1_6;
           enableServer = true;
           serverSettings = {
             origin = "https://${serverDomain}";
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index b3b4e0213cbf..69dac0de6865 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -26,6 +26,7 @@ import ./make-test-python.nix (
       { pkgs, ... }:
       {
         services.kanidm = {
+          package = pkgs.kanidm_1_6;
           enableServer = true;
           serverSettings = {
             origin = "https://${serverDomain}";
@@ -55,6 +56,7 @@ import ./make-test-python.nix (
       { nodes, ... }:
       {
         services.kanidm = {
+          package = pkgs.kanidm_1_6;
           enableClient = true;
           clientSettings = {
             uri = "https://${serverDomain}";