Unverified Commit 4b228711 authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

kanidm_1_10: init at 1.10.0 (#515478)

parents a3905402 d062d65d

nixos/tests/kanidm-provisioning.nix

+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_8;

  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidmWithSecretProvisioning_1_10;



  nodes.provision =

    { pkgs, lib, ... }:

nixos/tests/kanidm.nix

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ in 
    oddlama

  ];



  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_8;

  _module.args.kanidmPackage = pkgs.lib.mkDefault pkgs.kanidm_1_10;



  nodes.server =

    { pkgs, ... }:

pkgs/servers/kanidm/1_10.nix

0 → 100644
+5 −0
Original line number Diff line number Diff line 
import ./generic.nix {

  version = "1.10.0";

  hash = "sha256-VKzeyhps9NC+tU7NaGZf2kTCCK6J5LU1ewJBhS/Noek=";

  cargoHash = "sha256-hvWZLGJBsMbpZQixafdYzqT+zMbk2vAtPYpJ4OBVhoU=";

}

pkgs/servers/kanidm/1_9.nix

+1 −0
Original line number Diff line number Diff line
@@ -2,4 +2,5 @@ import ./generic.nix { 
  version = "1.9.3";

  hash = "sha256-YI2nShQhsCd1vn7S4VeCELfcU0HsmZrFs60kllJJFAo=";

  cargoHash = "sha256-b6kBDA/CDJHbybfvbRRZ++q9H+SVRu0BmgkwzN2i/YU=";

  eolDate = "2026-05-31";

}

pkgs/servers/kanidm/generic.nix

+8 −1
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    inherit hash;

  };



  __structuredAttrs = true;



  env.KANIDM_BUILD_PROFILE = "release_nixpkgs_${arch}";



  patches =
@@ -105,13 +107,15 @@ rustPlatform.buildRustPackage (finalAttrs: { 
  ];



  buildInputs = [

    openssl

    sqlite

    pam

    rust-jemalloc-sys

  ]

  ++ lib.optionals stdenv.hostPlatform.isLinux [

    udev

  ]

  ++ lib.optionals (lib.versionOlder finalAttrs.version "1.10") [

    openssl

  ];



  # The UI needs to be in place before the tests are run.
@@ -133,6 +137,9 @@ rustPlatform.buildRustPackage (finalAttrs: { 
    ''profile.release.lto="off"''

  ];



  # A bunch of the tests break due to the sandboxing.

  doCheck = false;



  preFixup = ''

    installShellCompletion \

      --bash $releaseDir/build/completions/*.bash \