Merge pull request #297826 from anthonyroussel/update-tomcat_connectors (bd4241bc) · Commits · mdf / nixpkgs

nixos/modules/services/web-servers/apache-httpd/default.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 = ''

pkgs/servers/http/apache-modules/tomcat-connectors/default.nix→pkgs/servers/http/apache-modules/mod_jk/default.nix

+6 −4

Original line number	Diff line number	Diff line
		{ lib, stdenv, fetchurl, apacheHttpd, jdk }:

		stdenv.mkDerivation rec {
		pname = "tomcat-connectors";
		version = "1.2.48";
		pname = "mod_jk";
		version = "1.2.49";

		src = fetchurl {
		url = "mirror://apache/tomcat/tomcat-connectors/jk/${pname}-${version}-src.tar.gz";
		sha256 = "15wfj1mvad15j1fqw67qbpbpwrcz3rb0zdhrq6z2sax1l05kc6yb";
		url = "mirror://apache/tomcat/tomcat-connectors/jk/tomcat-connectors-${version}-src.tar.gz";
		hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw=";
		};

		configureFlags = [
		@@ -28,7 +28,9 @@ 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;
		maintainers = with maintainers; [ anthonyroussel ];
		platforms = platforms.unix;
		};
		}

pkgs/top-level/aliases.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -1354,6 +1354,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
		transmission = lib.warn (transmission3Warning {}) transmission_3; # Added 2024-06-10

pkgs/top-level/all-packages.nix

+10 −25

Original line number	Diff line number	Diff line
		@@ -25236,39 +25236,26 @@ 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_itk = callPackage ../servers/http/apache-modules/mod_itk { };
		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 { };

		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; };
		} // lib.optionalAttrs config.allowAliases {
		mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
		@@ -25951,8 +25938,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 { };

Admin message