Skip to content

Commit ea5059a

Browse files
authored
kanidm: fix to actually work on Linux again (#408643)
2 parents fbb150f + bf0aa25 commit ea5059a

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

nixos/tests/kanidm-provisioning.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import ./make-test-python.nix (
2323
{ pkgs, lib, ... }:
2424
{
2525
services.kanidm = {
26-
package = pkgs.kanidmWithSecretProvisioning;
26+
package = pkgs.kanidmWithSecretProvisioning_1_6;
2727
enableServer = true;
2828
serverSettings = {
2929
origin = "https://${serverDomain}";

nixos/tests/kanidm.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import ./make-test-python.nix (
2626
{ pkgs, ... }:
2727
{
2828
services.kanidm = {
29+
package = pkgs.kanidm_1_6;
2930
enableServer = true;
3031
serverSettings = {
3132
origin = "https://${serverDomain}";
@@ -55,6 +56,7 @@ import ./make-test-python.nix (
5556
{ nodes, ... }:
5657
{
5758
services.kanidm = {
59+
package = pkgs.kanidm_1_6;
5860
enableClient = true;
5961
clientSettings = {
6062
uri = "https://${serverDomain}";

pkgs/by-name/ka/kanidm/generic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage rec {
4949
inherit hash;
5050
};
5151

52-
KANIDM_BUILD_PROFILE = "release_nixpgs_${arch}";
52+
KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";
5353

5454
patches = lib.optionals enableSecretProvisioning [
5555
"${patchDir}/oauth2-basic-secret-modify.patch"
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
5959
postPatch =
6060
let
6161
format = (formats.toml { }).generate "${KANIDM_BUILD_PROFILE}.toml";
62-
socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidm/sock" else "/var/run/kanidm.socket";
62+
socket_path = if stdenv.hostPlatform.isLinux then "/run/kanidmd/sock" else "/var/run/kanidm.socket";
6363
profile =
6464
{
6565
cpu_flags = if stdenv.hostPlatform.isx86_64 then "x86_64_legacy" else "none";

0 commit comments

Comments
 (0)