From dd663dbf624821e30f9a763ab9631e5d83fcf543 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 25 Aug 2024 12:02:08 +0200
Subject: [PATCH 1/2] apacheHttpdPackages.mod_jk: 1.2.49 -> 1.2.50

https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html
---
 .../http/apache-modules/mod_jk/default.nix    | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix
index 22a50ea8feb6..fd66cd09fb51 100644
--- a/pkgs/servers/http/apache-modules/mod_jk/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix
@@ -1,14 +1,20 @@
-{ lib, stdenv, fetchurl, apacheHttpd, jdk }:
+{ lib, stdenv, autoreconfHook, fetchFromGitHub, apacheHttpd, jdk }:
 
 stdenv.mkDerivation rec {
   pname = "mod_jk";
-  version = "1.2.49";
+  version = "1.2.50";
 
-  src = fetchurl {
-    url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz";
-    hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw=";
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "tomcat-connectors";
+    rev = "refs/tags/JK_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-hlwlx7Sb4oeZIzHQYOC3e9xEZK9u6ZG8Q2U/XdKMe3U=";
   };
 
+  nativeBuildInputs = [ autoreconfHook ];
+
+  buildInputs = [ apacheHttpd jdk ];
+
   configureFlags = [
     "--with-apxs=${apacheHttpd.dev}/bin/apxs"
     "--with-java-home=${jdk}"
@@ -19,18 +25,20 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    runHook preInstall
+
     mkdir -p $out/modules
     cp apache-2.0/mod_jk.so $out/modules
+
+    runHook postInstall
   '';
 
-  buildInputs = [ apacheHttpd jdk ];
-
-  meta = with lib; {
+  meta = {
     description = "Provides web server plugins to connect web servers with Tomcat";
     homepage = "https://tomcat.apache.org/download-connectors.cgi";
     changelog = "https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ anthonyroussel ];
-    platforms = platforms.unix;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ anthonyroussel ];
+    platforms = lib.platforms.unix;
   };
 }

From 51b2714417a45f7682ae9aab354aec3cd53b34bb Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Sun, 25 Aug 2024 12:03:58 +0200
Subject: [PATCH 2/2] apacheHttpdPackages.mod_jk: reformat with
 nixfmt-rfc-style

---
 .../http/apache-modules/mod_jk/default.nix    | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix
index fd66cd09fb51..b1134f7d3f3c 100644
--- a/pkgs/servers/http/apache-modules/mod_jk/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix
@@ -1,4 +1,11 @@
-{ lib, stdenv, autoreconfHook, fetchFromGitHub, apacheHttpd, jdk }:
+{
+  lib,
+  stdenv,
+  apacheHttpd,
+  autoreconfHook,
+  fetchFromGitHub,
+  jdk,
+}:
 
 stdenv.mkDerivation rec {
   pname = "mod_jk";
@@ -11,19 +18,20 @@ stdenv.mkDerivation rec {
     hash = "sha256-hlwlx7Sb4oeZIzHQYOC3e9xEZK9u6ZG8Q2U/XdKMe3U=";
   };
 
+  sourceRoot = "${src.name}/native";
+
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ apacheHttpd jdk ];
+  buildInputs = [
+    apacheHttpd
+    jdk
+  ];
 
   configureFlags = [
     "--with-apxs=${apacheHttpd.dev}/bin/apxs"
     "--with-java-home=${jdk}"
   ];
 
-  setSourceRoot = ''
-    sourceRoot=$(echo */native)
-  '';
-
   installPhase = ''
     runHook preInstall