From 956c9fd0bf619867ad2f39f1698229ca81890a06 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Mon, 21 Jul 2025 20:51:51 +0200 Subject: [PATCH 1/2] keycloak: switch to finalAttrs pattern --- pkgs/by-name/ke/keycloak/package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index ed999f096682..03efe7f933fa 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, fetchzip, makeWrapper, jre_headless, @@ -22,12 +22,12 @@ let ) "--features-disabled=${lib.concatStringsSep "," disabledFeatures}"} ''; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; version = "26.3.1"; src = fetchzip { - url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; + url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; hash = "sha256-M3YbS/aK9y4N2kZrm1wNT1ZaWAaUwaRn9QQ8fMdOV5g="; }; @@ -104,5 +104,4 @@ stdenv.mkDerivation rec { leona ]; }; - -} +}) From 5fd5a18fdefb282fc7dd075226383ab262325154 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Tue, 22 Jul 2025 10:12:33 +0200 Subject: [PATCH 2/2] keycloak: makeWrapper -> makeBinaryWrapper --- pkgs/by-name/ke/keycloak/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 03efe7f933fa..14861246630a 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchzip, - makeWrapper, + makeBinaryWrapper, jre_headless, nixosTests, callPackage, @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ - makeWrapper + makeBinaryWrapper jre_headless ];