dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

apacheHttpd: remove support for mod_tls

Browse Source 
It has been removed upstream and is now managed independently.

988f449632
This commit is contained in:
Thomas Gerbet 2024-10-31 12:41:44 +01:00
parent 01ccbb3e07
commit b5dea63a56
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/http/apache-httpd/2.4.nix
View File

@ -2,7 +2,6 @@
, nixosTests , nixosTests
, proxySupport ? true , proxySupport ? true
, sslSupport ? true, openssl , sslSupport ? true, openssl
, modTlsSupport ? false, rustls-ffi, Foundation
, http2Support ? true, nghttp2 , http2Support ? true, nghttp2
, ldapSupport ? true, openldap , ldapSupport ? true, openldap
, libxml2Support ? true, libxml2 , libxml2Support ? true, libxml2
@ -40,8 +39,6 @@ stdenv.mkDerivation rec {
buildInputs = [ perl libxcrypt zlib ] ++ buildInputs = [ perl libxcrypt zlib ] ++
lib.optional brotliSupport brotli ++ lib.optional brotliSupport brotli ++
lib.optional sslSupport openssl ++ lib.optional sslSupport openssl ++
lib.optional modTlsSupport rustls-ffi ++
lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
lib.optional libxml2Support libxml2 ++ lib.optional libxml2Support libxml2 ++
lib.optional http2Support nghttp2 ++ lib.optional http2Support nghttp2 ++
@ -70,7 +67,6 @@ stdenv.mkDerivation rec {
"--includedir=${placeholder "dev"}/include" "--includedir=${placeholder "dev"}/include"
(lib.enableFeature proxySupport "proxy") (lib.enableFeature proxySupport "proxy")
(lib.enableFeature sslSupport "ssl") (lib.enableFeature sslSupport "ssl")
(lib.enableFeature modTlsSupport "tls")
(lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
"--docdir=$(doc)/share/doc" "--docdir=$(doc)/share/doc"

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

@ -11518,9 +11518,7 @@ with pkgs;
alerta-server = callPackage ../servers/monitoring/alerta { }; alerta-server = callPackage ../servers/monitoring/alerta { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
inherit (darwin.apple_sdk.frameworks) Foundation;
};
apacheHttpd = apacheHttpd_2_4; apacheHttpd = apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in { apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {