movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

apacheHttpdPackages.mod_jk: rename from tomcat_connectors

Browse source
This commit is contained in:
Anthony Roussel 2024-03-21 21:31:51 +01:00
parent b873135b40
commit e0a905ef96
No known key found for this signature in database
GPG key ID: 9DC4987B1A55E75E
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -435,7 +435,7 @@ in
example = literalExpression '' example = literalExpression ''
[ [
"proxy_connect" "proxy_connect"
{ name = "jk"; path = "''${pkgs.tomcat_connectors}/modules/mod_jk.so"; } { name = "jk"; path = "''${pkgs.apacheHttpdPackages.mod_jk}/modules/mod_jk.so"; }
] ]
''; '';
description = '' description = ''

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

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, apacheHttpd, jdk }: { lib, stdenv, fetchurl, apacheHttpd, jdk }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tomcat-connectors"; pname = "mod_jk";
version = "1.2.49"; version = "1.2.49";
src = fetchurl { 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="; hash = "sha256-Q8sCg8koeOnU7xEGMdvSvra1VxPBJ84EMZCyswh1fpw=";
}; };

1
pkgs/top-level/aliases.nix
View file

@ -1288,6 +1288,7 @@ mapAliases ({
tkcvs = tkrev; # Added 2022-03-07 tkcvs = tkrev; # Added 2022-03-07
tokodon = plasma5Packages.tokodon; tokodon = plasma5Packages.tokodon;
tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28 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 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 tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
transfig = fig2dev; # Added 2022-02-15 transfig = fig2dev; # Added 2022-02-15

4
pkgs/top-level/all-packages.nix
View file

@ -25413,6 +25413,8 @@ with pkgs;
php = pkgs.php.override { inherit apacheHttpd; }; php = pkgs.php.override { inherit apacheHttpd; };
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; }; subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
mod_jk = callPackage ../servers/http/apache-modules/mod_jk { };
} // lib.optionalAttrs config.allowAliases { } // lib.optionalAttrs config.allowAliases {
mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4"; mod_evasive = throw "mod_evasive is not supported on Apache httpd 2.4";
mod_wsgi = self.mod_wsgi2; mod_wsgi = self.mod_wsgi2;
@ -26097,8 +26099,6 @@ with pkgs;
pulseeffects-legacy = callPackage ../applications/audio/pulseeffects-legacy { }; 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 { }; tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { };
pies = callPackage ../servers/pies { }; pies = callPackage ../servers/pies { };