From deae39af435a3088be677dbeb88a0167fd4682c4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 15 Nov 2023 00:05:07 +0100 Subject: [PATCH] nixos/plantuml-server: use jetty_11 PlantUML Server does not support Jetty versions higher than 12.x. Jetty 12.x has introduced major breaking changes, see * https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.0 * https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-migration-11-to-12 --- .../modules/services/web-apps/plantuml-server.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index e5a6f0283474..4e24b3f24b10 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -24,7 +24,17 @@ in packages = { jdk = mkPackageOptionMD pkgs "jdk" { }; - jetty = mkPackageOptionMD pkgs "jetty" { }; + jetty = mkPackageOptionMD pkgs "jetty" { + default = "jetty_11"; + extraDescription = '' + At the time of writing (v1.2023.12), PlantUML Server does not support + Jetty versions higher than 12.x. + + Jetty 12.x has introduced major breaking changes, see + and + + ''; + }; }; user = mkOption { @@ -40,7 +50,7 @@ in }; home = mkOption { - type = types.str; + type = types.path; default = "/var/lib/plantuml"; description = mdDoc "Home directory of the PlantUML server instance."; };