From 8ba624c7192622a3a26908bcc8c9cb073702b97d Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 21:05:03 +0200
Subject: [PATCH 1/4] jetty_11: 11.0.20 -> 11.0.22

https://github.com/jetty/jetty.project/releases/tag/jetty-11.0.22
https://github.com/jetty/jetty.project/releases/tag/jetty-11.0.21
---
 pkgs/servers/http/jetty/11.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/11.x.nix b/pkgs/servers/http/jetty/11.x.nix
index 0744d76a32d1..e19e1b4dc130 100644
--- a/pkgs/servers/http/jetty/11.x.nix
+++ b/pkgs/servers/http/jetty/11.x.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "11.0.20";
-  hash = "sha256-qOpIWht7Q8zjNRiHvpN5SBy+hOhddhgor5S55gWxHlQ=";
+  version = "11.0.22";
+  hash = "sha256-afFuUZ1csDuE60m+WKMriU/wObBZleTORLOCFU8qcJk=";
 }

From fa9c8bb1b14c035f6bcd4284020f0088a1be744a Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 20:44:30 +0200
Subject: [PATCH 2/4] jetty_12: 12.0.9 -> 12.0.11

https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.11
https://github.com/jetty/jetty.project/releases/tag/jetty-12.0.10
---
 pkgs/servers/http/jetty/12.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/12.x.nix b/pkgs/servers/http/jetty/12.x.nix
index e35533d547a9..0bbcb76e03a3 100644
--- a/pkgs/servers/http/jetty/12.x.nix
+++ b/pkgs/servers/http/jetty/12.x.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "12.0.9";
-  hash = "sha256-+/pn6Q24QDTaK+Slr+B17fshEXXh6sO1DWRuFGfi2h0=";
+  version = "12.0.11";
+  hash = "sha256-5fZMHb2ZpkoAFY/v124F+99Kq9vZypSYrG8QmQ/RK6k=";
 }

From f0e575ba95603472f3ebb137bdf63f4cdfd35811 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 20:45:50 +0200
Subject: [PATCH 3/4] jetty: add passthru.updateScript

---
 pkgs/servers/http/jetty/common.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix
index 71f0dee03013..917e241b7f8f 100644
--- a/pkgs/servers/http/jetty/common.nix
+++ b/pkgs/servers/http/jetty/common.nix
@@ -1,6 +1,6 @@
 { version, hash }:
 
-{ lib, stdenvNoCC, fetchurl }:
+{ lib, stdenvNoCC, fetchurl, gitUpdater }:
 
 stdenvNoCC.mkDerivation rec {
   pname = "jetty";
@@ -19,6 +19,13 @@ stdenvNoCC.mkDerivation rec {
     mv etc lib modules start.jar $out
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/jetty/jetty.project.git";
+    allowedVersions = "^${lib.versions.major version}\\.";
+    ignoredVersions = "(alpha|beta).*";
+    rev-prefix = "jetty-";
+  };
+
   meta = with lib; {
     description = "Web server and javax.servlet container";
     homepage = "https://eclipse.dev/jetty/";

From 96829d14b785b1fe9c82b1e5a5e64261216a2ae1 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Sun, 14 Jul 2024 20:46:51 +0200
Subject: [PATCH 4/4] jetty: add meta.changelog, update meta.homepage

---
 pkgs/servers/http/jetty/common.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/jetty/common.nix b/pkgs/servers/http/jetty/common.nix
index 917e241b7f8f..9b9e064e993f 100644
--- a/pkgs/servers/http/jetty/common.nix
+++ b/pkgs/servers/http/jetty/common.nix
@@ -27,8 +27,9 @@ stdenvNoCC.mkDerivation rec {
   };
 
   meta = with lib; {
+    changelog = "https://github.com/jetty/jetty.project/releases/tag/jetty-${version}";
     description = "Web server and javax.servlet container";
-    homepage = "https://eclipse.dev/jetty/";
+    homepage = "https://jetty.org/";
     platforms = platforms.all;
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = with licenses; [ asl20 epl10 ];