From b873135b40173faaab47d63068912582adf5b1d2 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 21:25:00 +0100 Subject: [PATCH 1/4] tomcat_connectors: 1.2.48 -> 1.2.49 https://tomcat.apache.org/connectors-doc/miscellaneous/changelog.html https://github.com/apache/tomcat-connectors/compare/JK_1_2_48...JK_1_2_49 --- .../http/apache-modules/tomcat-connectors/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix index 20879d4aaf21..4607ccc9b141 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-connectors"; - version = "1.2.48"; + version = "1.2.49"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; - sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb"; + hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; }; configureFlags = [ @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { 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; platforms = platforms.unix; }; From e0a905ef96e58f8ec1d7cecfcfba63e31ef61d69 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 21:31:51 +0100 Subject: [PATCH 2/4] apacheHttpdPackages.mod_jk: rename from tomcat_connectors --- nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- .../apache-modules/{tomcat-connectors => mod_jk}/default.nix | 4 ++-- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) rename pkgs/servers/http/apache-modules/{tomcat-connectors => mod_jk}/default.nix (87%) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 4d49b29efff6..5dd28a1db00e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -435,7 +435,7 @@ in example = literalExpression '' [ "proxy_connect" - { name = "jk"; path = "''${pkgs.tomcat_connectors}/modules/mod_jk.so"; } + { name = "jk"; path = "''${pkgs.apacheHttpdPackages.mod_jk}/modules/mod_jk.so"; } ] ''; description = '' diff --git a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix similarity index 87% rename from pkgs/servers/http/apache-modules/tomcat-connectors/default.nix rename to pkgs/servers/http/apache-modules/mod_jk/default.nix index 4607ccc9b141..7ece04513682 100644 --- a/pkgs/servers/http/apache-modules/tomcat-connectors/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -1,11 +1,11 @@ { lib, stdenv, fetchurl, apacheHttpd, jdk }: stdenv.mkDerivation rec { - pname = "tomcat-connectors"; + pname = "mod_jk"; version = "1.2.49"; src = fetchurl { - url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz"; + url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz"; hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw="; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 104b13076b4c..1496fad15bb2 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1288,6 +1288,7 @@ mapAliases ({ tkcvs = tkrev; # Added 2022-03-07 tokodon = plasma5Packages.tokodon; tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 + tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07 tootle = throw "'tootle' has been removed as it is not maintained upstream. Consider using 'tuba' instead"; # Added 2024-02-11 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23 transfig = fig2dev; # Added 2022-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd3557c324cb..15bde2b5ba77 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25413,6 +25413,8 @@ with pkgs; php = pkgs.php.override { inherit apacheHttpd; }; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; + + mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_wsgi = self.mod_wsgi2; @@ -26097,8 +26099,6 @@ with pkgs; pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; - tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; - tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; pies = callPackage ../servers/pies { }; From 2866cf57e9c3deee489130d11b721638cb557ed4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 21:33:28 +0100 Subject: [PATCH 3/4] apacheHttpdPackages.mod_jk: add anthonyroussel to maintainers --- pkgs/servers/http/apache-modules/mod_jk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/http/apache-modules/mod_jk/default.nix b/pkgs/servers/http/apache-modules/mod_jk/default.nix index 7ece04513682..22a50ea8feb6 100644 --- a/pkgs/servers/http/apache-modules/mod_jk/default.nix +++ b/pkgs/servers/http/apache-modules/mod_jk/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { 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; }; } From 3b62ca16cc9fc530311e655149a08100e89d268d Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 21 Mar 2024 21:39:11 +0100 Subject: [PATCH 4/4] all-packages: reorder apacheHttpdPackages --- pkgs/top-level/all-packages.nix | 41 +++++++++++---------------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15bde2b5ba77..85d7070b5158 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25379,42 +25379,27 @@ with pkgs; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { inherit apacheHttpd; - mod_auth_mellon = callPackage ../servers/http/apache-modules/mod_auth_mellon { }; - - # Redwax collection mod_ca = callPackage ../servers/http/apache-modules/mod_ca { }; mod_crl = callPackage ../servers/http/apache-modules/mod_crl { }; - mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_cspnonce = callPackage ../servers/http/apache-modules/mod_cspnonce { }; - mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp{ }; - mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; - mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; - mod_spkac= callPackage ../servers/http/apache-modules/mod_spkac { }; - mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; - + mod_csr = callPackage ../servers/http/apache-modules/mod_csr { }; mod_dnssd = callPackage ../servers/http/apache-modules/mod_dnssd { }; - - - mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; - mod_fastcgi = callPackage ../servers/http/apache-modules/mod_fastcgi { }; - - mod_python = callPackage ../servers/http/apache-modules/mod_python { }; - - mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; - - mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; - mod_itk = callPackage ../servers/http/apache-modules/mod_itk { }; - - mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; - - php = pkgs.php.override { inherit apacheHttpd; }; - - subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; - mod_jk = callPackage ../servers/http/apache-modules/mod_jk { }; + mod_mbtiles = callPackage ../servers/http/apache-modules/mod_mbtiles { }; + mod_ocsp = callPackage ../servers/http/apache-modules/mod_ocsp { }; + mod_perl = callPackage ../servers/http/apache-modules/mod_perl { }; + mod_pkcs12 = callPackage ../servers/http/apache-modules/mod_pkcs12 { }; + mod_python = callPackage ../servers/http/apache-modules/mod_python { }; + mod_scep = callPackage ../servers/http/apache-modules/mod_scep { }; + mod_spkac = callPackage ../servers/http/apache-modules/mod_spkac { }; + mod_tile = callPackage ../servers/http/apache-modules/mod_tile { }; + mod_timestamp = callPackage ../servers/http/apache-modules/mod_timestamp { }; + mod_wsgi3 = callPackage ../servers/http/apache-modules/mod_wsgi { }; + php = pkgs.php.override { inherit apacheHttpd; }; + subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; } // lib.optionalAttrs config.allowAliases { mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_wsgi = self.mod_wsgi2;