about summary refs log tree commit diff
path: root/pkgs/servers/kanidm
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2022-09-05 14:11:48 +0200
committerKerstin <kerstin@erictapen.name>2022-09-05 17:13:10 +0200
commitb6f5b819203d044247f92204d235689640a42634 (patch)
tree9e65aca206438fbc6157ccf917436404eb8619c2 /pkgs/servers/kanidm
parent07dc8ecd7893b1b3b08b6b96ccd29e11b925fd23 (diff)
kanidm: 1.1.0-alpha.8 -> 1.1.0-alpha.9
https://github.com/kanidm/kanidm/releases/tag/v1.1.0-alpha.9

Uses a concrete rev, because it relies on additional commits from the
release branch that provide build fixes.
Diffstat (limited to 'pkgs/servers/kanidm')
-rw-r--r--pkgs/servers/kanidm/default.nix31
1 files changed, 14 insertions, 17 deletions
diff --git a/pkgs/servers/kanidm/default.nix b/pkgs/servers/kanidm/default.nix
index f160886fb6400..0984a622330cd 100644
--- a/pkgs/servers/kanidm/default.nix
+++ b/pkgs/servers/kanidm/default.nix
@@ -17,16 +17,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "kanidm";
-  version = "1.1.0-alpha.8";
+  version = "1.1.0-alpha.9";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-zMtbE6Y9wXFPBqhmiTMJ3m6bLVZl+c6lRY39DWDlJNo=";
+    rev = "985462590b1c49b26a0b0ee01e24b1eb01942165";
+    hash = "sha256-JtoDuA3NCKmX+wDqav30VwrLeDALYat1iKFWpbYOO1s=";
   };
 
-  cargoSha256 = "sha256:1l7xqp457zfd9gfjp6f4lzgadfp6112jbip4irazw4084qwj0z6x";
+  cargoSha256 = "sha256-pkBkXIG2PF5YMeighQwHwhURWbJabfveyszRIdrQjcA=";
 
   KANIDM_BUILD_PROFILE = "release_nixos_${arch}";
 
@@ -56,25 +56,22 @@ rustPlatform.buildRustPackage rec {
     pam
   ];
 
-  # Failing tests, probably due to network issues
-  checkFlags = [
-    "--skip default_entries"
-    "--skip oauth2_openid_basic_flow"
-    "--skip test_server"
-    "--skip test_cache"
-  ];
+  # The UI needs to be in place before the tests are run.
+  postBuild = ''
+    # We don't compile the wasm-part form source, as there isn't a rustc for
+    # wasm32-unknown-unknown in nixpkgs yet.
+    mkdir $out
+    cp -r kanidmd_web_ui/pkg $out/ui
+  '';
 
   preFixup = ''
-    installShellCompletion --bash $releaseDir/build/completions/*.bash
-    installShellCompletion --zsh  $releaseDir/build/completions/_*
+    installShellCompletion \
+      --bash $releaseDir/build/completions/*.bash \
+      --zsh $releaseDir/build/completions/_*
 
     # PAM and NSS need fix library names
     mv $out/lib/libnss_kanidm.so $out/lib/libnss_kanidm.so.2
     mv $out/lib/libpam_kanidm.so $out/lib/pam_kanidm.so
-
-    # We don't compile the wasm-part form source, as there isn't a rustc for
-    # wasm32-unknown-unknown in nixpkgs yet.
-    cp -r kanidmd_web_ui/pkg $out/ui
   '';
 
   passthru.tests = { inherit (nixosTests) kanidm; };