diff --git a/nixos/modules/services/web-apps/keycloak.nix b/nixos/modules/services/web-apps/keycloak.nix index 6d472cf48cd01..1bca932932cd7 100644 --- a/nixos/modules/services/web-apps/keycloak.nix +++ b/nixos/modules/services/web-apps/keycloak.nix @@ -650,6 +650,7 @@ in ln -s ${themesBundle} /run/keycloak/themes ln -s ${keycloakBuild}/providers /run/keycloak/ + ln -s ${keycloakBuild}/lib /run/keycloak/ install -D -m 0600 ${confFile} /run/keycloak/conf/keycloak.conf diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 67b412c80961d..aeb851174219f 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -20,6 +20,8 @@ let nodes = { keycloak = { config, ... }: { + virtualisation.memorySize = 2047; + security.pki.certificateFiles = [ certs.ca.cert ]; diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 743607a3f4718..3ee0ff18a16f5 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -7,7 +7,7 @@ , callPackage , confFile ? null , plugins ? [ ] -, extraFeatures ? [ ] +, extraFeatures ? [ "hostname:v1" ] , disabledFeatures ? [ ] }: @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "24.0.5"; + version = "25.0.6"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-lf1miVEGQvPbmlOZMCXUyX/pKE+JoJFawhjVEPJDJ6s="; + hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08="; }; nativeBuildInputs = [ makeWrapper jre ]; diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 82e6163491ba9..55f94aa6073f1 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -1,21 +1,21 @@ -{ maven, stdenv, lib, fetchFromGitHub }: +{ + maven, + lib, + fetchFromGitHub, +}: maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "5.0.0"; + version = "6.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; + hash = "sha256-MMonBRau8FpfCqija6NEdvp4zJfEub2Kwk4MA7FYWHI="; }; - mvnHash = { - aarch64-linux = "sha256-zO79pRrY8TqrSK4bB8l4pl6834aFX2pidyk1j9Itz1E=`"; - x86_64-linux = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; - }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system} for ${pname}"); - + mvnHash = "sha256-IrqDybt9bltX0WbGpbEXORHGFC/1f2Y9izSBPTrYCaY="; installPhase = '' runHook preInstall @@ -23,11 +23,11 @@ maven.buildMavenPackage rec { runHook postInstall ''; - meta = with lib; { + meta = { homepage = "https://github.com/aerogear/keycloak-metrics-spi"; description = "Keycloak Service Provider that adds a metrics endpoint"; - license = licenses.asl20; - maintainers = with maintainers; [ benley ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ benley ]; + platforms = lib.platforms.linux; }; }