From e99590088836afc534a53c689e9b3c2aeb2b1974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 13:12:35 +0000 Subject: [PATCH 1/5] keycloak: 23.0.7 -> 24.0.0 --- 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 96a8f4673e66..754d51bdef0f 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 = "23.0.7"; + version = "24.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-9Hx7pX4m60u1UZAqXiafqEPMTvDVNdGLZfsSCktF84Q="; + hash = "sha256-UCXSFhpLHDQfw/s0rCywzL1JTs7XOlt+JUKp4Y/IGoY="; }; nativeBuildInputs = [ makeWrapper jre ]; From 77366d1b0ad71b1682a9dba841c74e5d375f3b18 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:08:29 -0500 Subject: [PATCH 2/5] keycloak: 24.0.0 -> 24.0.1 --- 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 754d51bdef0f..c0c93f2cf736 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.0"; + version = "24.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-UCXSFhpLHDQfw/s0rCywzL1JTs7XOlt+JUKp4Y/IGoY="; + hash = "sha256-d7bITeukqoLwEPQrUn01arXf8j7L8gM47wzHMsBvz2M="; }; nativeBuildInputs = [ makeWrapper jre ]; From 809eb566f6dfbf17bb22d1a436b81352fce92315 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 4 Mar 2024 17:40:09 +0100 Subject: [PATCH 3/5] keycloak.plugins.keycloak-restrict-client-auth: 23.0.0 -> 24.0.0 Release: https://github.com/sventorben/keycloak-restrict-client-auth/releases/tag/v24.0.0 --- .../keycloak/keycloak-restrict-client-auth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix index bf5d38bca013..16d37617336c 100644 --- a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix +++ b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-restrict-client-auth"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "sventorben"; repo = "keycloak-restrict-client-auth"; rev = "v${version}"; - hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g="; + hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM="; }; - mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4="; + mvnHash = "sha256-Pk2yYuBqGs4k1KwaU06RQe1LpohZu0VI1pHEUBU3EUE="; installPhase = '' runHook preInstall From ac12e7ffbd785ee645b2be3ad933827cfab40307 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:11:30 -0500 Subject: [PATCH 4/5] keycloak.plugins.keycloak-metrics-spi: 4.0.0 -> 5.0.0 Diff: https://github.com/aerogear/keycloak-metrics-spi/compare/refs/tags/4.0.0...5.0.0 --- pkgs/servers/keycloak/keycloak-metrics-spi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 4752e5fe08c9..3e2b6049b187 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; + hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; }; - mvnHash = "sha256-RjERY434UL9z/gNZFV+wMTITCmTPGanwu61L8sEGaKY="; + mvnHash = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; installPhase = '' runHook preInstall From 22ca26e22c1c9fcb5449ba902207ffa6a82aaa23 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:17:51 -0500 Subject: [PATCH 5/5] keycloak.plugins.keycloak-discord: 0.3.1 -> 0.5.0, set sourceProvenance --- pkgs/servers/keycloak/keycloak-discord/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 0605145ff96f..9f00a292aad4 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -5,19 +5,20 @@ stdenv.mkDerivation rec { pname = "keycloak-discord"; - version = "0.3.1"; + version = "0.5.0"; src = fetchurl { - url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; - sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-${version}.jar"; + hash = "sha256-radvUu2a6t0lbo5f/ADqy7+I/ONXB7/8pk2d1BtYzQA="; }; dontUnpack = true; dontBuild = true; installPhase = '' - mkdir -p "$out" - install "$src" "$out/${pname}-ear-${version}.ear" + runHook preInstall + install -Dm444 "$src" "$out/keycloak-discord-$version.jar" + runHook postInstall ''; meta = with lib; { @@ -25,5 +26,6 @@ stdenv.mkDerivation rec { description = "Keycloak Social Login extension for Discord"; license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; }