From 2f3952d525088d798e5ac75d4f4b361ba6be673b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 10 Jun 2024 07:32:38 -0400 Subject: [PATCH 1/9] keycloak: 24.0.5 -> 25.0.1 Diff: https://github.com/keycloak/keycloak/compare/24.0.5...25.0.1 (cherry picked from commit 134a223f3fda26847e51cbe92db9b06a8142e322) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 743607a3f4718..48d9ecec2b01b 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "24.0.5"; + version = "25.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-lf1miVEGQvPbmlOZMCXUyX/pKE+JoJFawhjVEPJDJ6s="; + hash = "sha256-gwnBCH65s8KGca2FNBxfBfNKox9OFTN3oEAPcYhSx9o="; }; nativeBuildInputs = [ makeWrapper jre ]; From 6f40cf2e611038d47e2cb0a9600f7f98d91b9af2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 12:48:55 +0000 Subject: [PATCH 2/9] keycloak: 25.0.1 -> 25.0.2 (cherry picked from commit 5182f25f5bbe33e936ed43ad04affd14e34c3698) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 48d9ecec2b01b..bc97af7d3faea 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.1"; + version = "25.0.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-gwnBCH65s8KGca2FNBxfBfNKox9OFTN3oEAPcYhSx9o="; + hash = "sha256-DYuK1W8dXI/UUB+9HzMnjiJdpJulS3QuIpmr3AA4OLo="; }; nativeBuildInputs = [ makeWrapper jre ]; From 21a7e0b5de7a7ceec713f43cecf9db2ba2e506df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Aug 2024 14:34:35 +0000 Subject: [PATCH 3/9] keycloak: 25.0.2 -> 25.0.4 (cherry picked from commit 84c49afaaaa997662d819fbf998475803db4bbcf) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index bc97af7d3faea..69aa61b92bf40 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.2"; + version = "25.0.4"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-DYuK1W8dXI/UUB+9HzMnjiJdpJulS3QuIpmr3AA4OLo="; + hash = "sha256-Pj8+0bfYnHhkYIDQkePpsmbYb6MN4BI+2VLLdZv3C1Q="; }; nativeBuildInputs = [ makeWrapper jre ]; From af75513288cb4653c87a5c710ec434586bedf99c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Sep 2024 17:17:45 +0000 Subject: [PATCH 4/9] keycloak: 25.0.4 -> 25.0.5 (cherry picked from commit c6fa7e48fee0dbd532213eb34e972286bc828f7c) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 69aa61b92bf40..5abc811fc78a5 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.4"; + version = "25.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-Pj8+0bfYnHhkYIDQkePpsmbYb6MN4BI+2VLLdZv3C1Q="; + hash = "sha256-2PEQjdz+r/qRJxlu0jI2watkNOUkf4bUCkcNPrLsaMg="; }; nativeBuildInputs = [ makeWrapper jre ]; From 85dcefb258229626834138f2bfc51420a4226814 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 19 Sep 2024 14:32:01 -0400 Subject: [PATCH 5/9] keycloak: 25.0.5 -> 25.0.6 Diff: https://github.com/keycloak/keycloak/compare/None...25.0.6 (cherry picked from commit fcb30ff38b578ab4b19271de14f6acb5c63d5bb4) --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 5abc811fc78a5..2ef6b0fdf399a 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "25.0.5"; + version = "25.0.6"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-2PEQjdz+r/qRJxlu0jI2watkNOUkf4bUCkcNPrLsaMg="; + hash = "sha256-1VHixRgErao/1ZEJv+rlnNmUd2NT35X89D8wuUhYF08="; }; nativeBuildInputs = [ makeWrapper jre ]; From 1c550f14bd043c217e9be263524ec0ca94730ec4 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 29 Jun 2024 19:17:26 -0400 Subject: [PATCH 6/9] keycloak: enable hostname:v1 feature by default --- pkgs/servers/keycloak/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 2ef6b0fdf399a..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 ? [ ] }: From 3e133804e4830927fd4109aa57a01a4e60047ad2 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 4 Oct 2024 20:04:52 -0400 Subject: [PATCH 7/9] nixos/keycloak: link $out/lib to KC_HOME_DIR to fix loading optimized app image Reference: https://www.keycloak.org/docs/latest/upgrading/index.html#additional-validations-on-the-optimized-startup-option --- nixos/modules/services/web-apps/keycloak.nix | 1 + 1 file changed, 1 insertion(+) 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 From cabf81a26f202662a57844ab23880dfe07394065 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 4 Oct 2024 21:32:49 -0400 Subject: [PATCH 8/9] nixos/keycloak: raise memory size in tests to 2047M (cherry picked from commit 937d3964c905ce30cf227da1ccc826b6821214cc) --- nixos/tests/keycloak.nix | 2 ++ 1 file changed, 2 insertions(+) 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 ]; From 990d052196ad5d2032927c91afc2c0f93be12c82 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 20 Jul 2024 15:35:54 -0400 Subject: [PATCH 9/9] keycloak.plugins.keycloak-metrics-spi: 5.0.0 -> 6.0.0 Diff: https://github.com/aerogear/keycloak-metrics-spi/compare/refs/tags/5.0.0...6.0.0 (cherry picked from commit fc92a20d35d82be17863fbc7685c239f64d1949b) --- .../keycloak/keycloak-metrics-spi/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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; }; }