From a454d196d592ac284163bc0b5322f41ebb53762d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Jun 2026 02:33:12 +0000
Subject: [PATCH 1/2] plantuml-server: 1.2026.5 -> 1.2026.6

---
 pkgs/by-name/pl/plantuml-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix
index 6618d990f540..d6cbc6985125 100644
--- a/pkgs/by-name/pl/plantuml-server/package.nix
+++ b/pkgs/by-name/pl/plantuml-server/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plantuml-server";
-  version = "1.2026.5";
+  version = "1.2026.6";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml-server/releases/download/v${finalAttrs.version}/plantuml-v${finalAttrs.version}.war";
-    hash = "sha256-Ub6Ao+m1hC+tEerkVnMXN2CMRf8CKg9XcB9E8JsunvY=";
+    hash = "sha256-1jcX6GMknJK5dGL74DMwYTDZNVkKI07MpL8qbb0WMi4=";
   };
 
   dontUnpack = true;

From 0476429bfce8e8cec87758ba7f9bcaa5c11c3779 Mon Sep 17 00:00:00 2001
From: Jakob Klepp <jakob.klepp@moonvision.io>
Date: Tue, 9 Jun 2026 11:37:16 +0200
Subject: [PATCH 2/2] nixos/plantuml-server: switch to jetty 12

---
 .../manual/release-notes/rl-2611.section.md   |  2 ++
 .../services/web-apps/plantuml-server.nix     | 20 ++++++-------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md
index a36490122096..490ea8ef0835 100644
--- a/nixos/doc/manual/release-notes/rl-2611.section.md
+++ b/nixos/doc/manual/release-notes/rl-2611.section.md
@@ -40,6 +40,8 @@
 
 - The `services.syncthing` module now updates the Syncthing REST API using partial updates (`PATCH`) instead of full replacements (`PUT`) for general settings. Updating these settings was broken and prone to errors after updates, see [#428808](https://github.com/NixOS/nixpkgs/issues/428808) and [#528889](https://github.com/NixOS/nixpkgs/issues/528889). As a result, settings modified manually through the Syncthing Web UI that are not explicitly defined in your Nix configuration will now persist across rebuilds.
 
+- `services.plantuml-server.packages.jetty` now supports `jetty_12`, it no longer supports `jetty_11`.
+
 ## Other Notable Changes {#sec-release-26.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix
index 184787d94c0e..59e8bc94c541 100644
--- a/nixos/modules/services/web-apps/plantuml-server.nix
+++ b/nixos/modules/services/web-apps/plantuml-server.nix
@@ -37,15 +37,7 @@ in
       packages = {
         jdk = mkPackageOption pkgs "jdk" { };
         jetty = mkPackageOption 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
-            <https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.0> and
-            <https://eclipse.dev/jetty/documentation/jetty-12/programming-guide/index.html#pg-migration-11-to-12>
-          '';
+          default = [ "jetty_12" ];
         };
       };
 
@@ -115,11 +107,11 @@ in
       script = ''
         ${cfg.packages.jdk}/bin/java \
           -jar ${cfg.packages.jetty}/start.jar \
-            --module=deploy,http,jsp \
-            jetty.home=${cfg.packages.jetty} \
-            jetty.base=${cfg.package} \
-            jetty.http.host=${cfg.listenHost} \
-            jetty.http.port=${toString cfg.listenPort}
+            --module=http,ee11-deploy,ee11-jsp \
+            -Djetty.home=${cfg.packages.jetty} \
+            -Djetty.base=${cfg.package} \
+            -Djetty.http.host=${cfg.listenHost} \
+            -Djetty.http.port=${toString cfg.listenPort}
       '';
 
       serviceConfig = {