From 1f6a08ed9b8c026d211a3a55d58cbfa77cf4c9d8 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Tue, 23 Jan 2024 12:04:28 +0100 Subject: [PATCH] keycloak: Update admin-ui and orgs --- modules/keycloak/keycloak-admin-ui.nix | 5 +++-- modules/keycloak/keycloak-orgs.nix | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/modules/keycloak/keycloak-admin-ui.nix b/modules/keycloak/keycloak-admin-ui.nix index a896edd..3a5d3da 100644 --- a/modules/keycloak/keycloak-admin-ui.nix +++ b/modules/keycloak/keycloak-admin-ui.nix @@ -13,12 +13,13 @@ buildMavenPackage { owner = "keycloak"; repo = "keycloak"; rev = version; - hash = "sha256-2tTdm8e+OUgO+g/ob1mw+4wFbr6wAPlnbCr8edKGuoE="; + hash = "sha256-SmK8xko+py5RnbwhCzDzpEDqUs52jdaVVNY7w1TXmRU="; }; sourceRoot = "source/integration/admin-client"; - mvnHash = "sha256-dM9KBAjRPtea3kgmkEQiS953U/jAAXOfgpJOE/KuCOE="; + mvnHash = "sha256-18V+g3LRndcQGhpyq3wWKM/u8lJQRd1064tatUZhGys="; + # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; installPhase = '' install -D target/keycloak-admin-client-${version}.jar $out/keycloak-admin-client-${version}.jar diff --git a/modules/keycloak/keycloak-orgs.nix b/modules/keycloak/keycloak-orgs.nix index 3de1668..2daa934 100644 --- a/modules/keycloak/keycloak-orgs.nix +++ b/modules/keycloak/keycloak-orgs.nix @@ -2,7 +2,7 @@ , fetchFromGitHub }: let - version = "0.43"; + version = "0.49"; in buildMavenPackage { inherit version; @@ -12,12 +12,16 @@ buildMavenPackage { owner = "p2-inc"; repo = "keycloak-orgs"; rev = "v${version}"; - hash = "sha256-aOnhUdDc9GNkBJx+bG393VDgFvB+ZKVzGBP8MBbqOhU="; + hash = "sha256-VkXyaQdAz/UsE+qTydRy4BMAxfo3pL2FbFIdmuhTehs="; + # hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; }; - mvnHash = "sha256-gOqXkyumC4/5S+Sb7/Ed7b93sR3kq660I0x4MFxFwro="; + doCheck = false; - mvnParameters = "-Dmaven.buildNumber.skip=true"; + mvnHash = "sha256-U+llOMa//Foybtv1j1ClHDGOTQndc2rPkoIuH4huf+I="; + # mvnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="; + + mvnParameters = "--batch-mode -DskipTests -Dmaven.test.skip=true -Dmaven.buildNumber.skip=true"; installPhase = '' install -D target/keycloak-orgs-${version}.jar $out/keycloak-orgs-${version}.jar