git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #171066 from felixsinger/pkgs/keycloak/update

keycloak: 17.0.1 -> 18.0.0

commitad5e4dacb42f9f710317d2f39666bc24e68d6194 authorKim Lindberger <kim.lindberger@gmail.com> dateWed 4 May 2022, 20:51 (5 years ago) parenteb4cc649765ee6
2 files changed+6−5
compare with master
unifiedsplit
nixos/modules/services/web-apps/keycloak.nix+2−1 pkgs/servers/keycloak/default.nix+4−4
nixos/modules/services/web-apps/keycloak.nix+2−1
@@ -540,7 +540,8 @@ in
540540 db = if cfg.database.type == "postgresql" then "postgres" else cfg.database.type;
541541 db-username = if databaseActuallyCreateLocally then "keycloak" else cfg.database.username;
542542 db-password._secret = cfg.database.passwordFile;
543− db-url-host = "${cfg.database.host}:${toString cfg.database.port}";
543+ db-url-host = cfg.database.host;
544+ db-url-port = toString cfg.database.port;
544545 db-url-database = if databaseActuallyCreateLocally then "keycloak" else cfg.database.name;
545546 db-url-properties = prefixUnlessEmpty "?" dbProps;
546547 db-url = null;
pkgs/servers/keycloak/default.nix+4−4
@@ -13,11 +13,11 @@
1313
1414stdenv.mkDerivation rec {
1515 pname = "keycloak";
16− version = "17.0.1";
16+ version = "18.0.0";
1717
1818 src = fetchzip {
1919 url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip";
20− sha256 = "sha256-z1LfTUoK+v4oQxdyIQruFhl5O333zirSrkPoTFgVfmI=";
20+ sha256 = "0fxf9m50hpjplj077z2zjp0qibixz5y4lbc8159cnxbd4gzpkaaf";
2121 };
2222
2323 nativeBuildInputs = [ makeWrapper jre ];
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
5757 '';
5858
5959 postFixup = ''
60− substituteInPlace $out/bin/kc.sh --replace '-Dkc.home.dir=$DIRNAME/../' '-Dkc.home.dir=$KC_HOME_DIR'
61− substituteInPlace $out/bin/kc.sh --replace '-Djboss.server.config.dir=$DIRNAME/../conf' '-Djboss.server.config.dir=$KC_CONF_DIR'
60+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Dkc.home.dir='$DIRNAME'/../"} '-Dkc.home.dir=$KC_HOME_DIR'
61+ substituteInPlace $out/bin/kc.sh --replace ${lib.escapeShellArg "-Djboss.server.config.dir='$DIRNAME'/../conf"} '-Djboss.server.config.dir=$KC_CONF_DIR'
6262
6363 for script in $(find $out/bin -type f -executable); do
6464 wrapProgram "$script" --set JAVA_HOME ${jre} --prefix PATH : ${jre}/bin