1 files changed, 42 insertions, 9 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix
index 614eb2a46798..6340f734d08c 100644
--- a/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix
+++ b/infra/libkookie/nixpkgs/pkgs/servers/keycloak/default.nix
@@ -1,12 +1,28 @@
-{ stdenv, fetchzip, makeWrapper, jre }:
+{ stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests
+, postgresql_jdbc ? null, mysql_jdbc ? null
+}:
 
+let
+  mkModuleXml = name: jarFile: writeText "module.xml" ''
+    <?xml version="1.0" ?>
+    <module xmlns="urn:jboss:module:1.3" name="${name}">
+        <resources>
+            <resource-root path="${jarFile}"/>
+        </resources>
+        <dependencies>
+            <module name="javax.api"/>
+            <module name="javax.transaction.api"/>
+        </dependencies>
+    </module>
+  '';
+in
 stdenv.mkDerivation rec {
   pname   = "keycloak";
-  version = "11.0.2";
+  version = "11.0.3";
 
   src = fetchzip {
     url    = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip";
-    sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0";
+    sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -16,20 +32,37 @@ stdenv.mkDerivation rec {
     cp -r * $out
 
     rm -rf $out/bin/*.{ps1,bat}
-    rm -rf $out/bin/add-user-keycloak.sh
-    rm -rf $out/bin/jconsole.sh
 
-    chmod +x $out/bin/standalone.sh
-    wrapProgram $out/bin/standalone.sh \
-      --prefix PATH ":" ${jre}/bin ;
+    module_path=$out/modules/system/layers/keycloak
+    if ! [[ -d $module_path ]]; then
+        echo "The module path $module_path not found!"
+        exit 1
+    fi
+
+    ${lib.optionalString (postgresql_jdbc != null) ''
+      mkdir -p $module_path/org/postgresql/main
+      ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/org/postgresql/main/
+      ln -s ${mkModuleXml "org.postgresql" "postgresql-jdbc.jar"} $module_path/org/postgresql/main/module.xml
+    ''}
+    ${lib.optionalString (mysql_jdbc != null) ''
+      mkdir -p $module_path/com/mysql/main
+      ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $module_path/com/mysql/main/
+      ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml
+    ''}
+
+    wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre}
+    wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre}
+    wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre}
   '';
 
+  passthru.tests = nixosTests.keycloak;
+
   meta = with stdenv.lib; {
     homepage    = "https://www.keycloak.org/";
     description = "Identity and access management for modern applications and services";
     license     = licenses.asl20;
     platforms   = jre.meta.platforms;
-    maintainers = [ maintainers.ngerstle ];
+    maintainers = with maintainers; [ ngerstle talyz ];
   };
 
 }