kanidm: fix to actually work on Linux again (#408643)

This commit is contained in:
K900
2025-05-19 11:23:56 +03:00
committed by GitHub
3 changed files with 5 additions and 3 deletions
+1 -1
View File
@@ -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}";
+2
View File
@@ -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}";
+2 -2
View File
@@ -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";