Skip to content

Commit b5dea63

Browse files
committed
apacheHttpd: remove support for mod_tls
It has been removed upstream and is now managed independently. apache/httpd@988f449
1 parent 01ccbb3 commit b5dea63

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

pkgs/servers/http/apache-httpd/2.4.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
, nixosTests
33
, proxySupport ? true
44
, sslSupport ? true, openssl
5-
, modTlsSupport ? false, rustls-ffi, Foundation
65
, http2Support ? true, nghttp2
76
, ldapSupport ? true, openldap
87
, libxml2Support ? true, libxml2
@@ -40,8 +39,6 @@ stdenv.mkDerivation rec {
4039
buildInputs = [ perl libxcrypt zlib ] ++
4140
lib.optional brotliSupport brotli ++
4241
lib.optional sslSupport openssl ++
43-
lib.optional modTlsSupport rustls-ffi ++
44-
lib.optional (modTlsSupport && stdenv.hostPlatform.isDarwin) Foundation ++
4542
lib.optional ldapSupport openldap ++ # there is no --with-ldap flag
4643
lib.optional libxml2Support libxml2 ++
4744
lib.optional http2Support nghttp2 ++
@@ -70,7 +67,6 @@ stdenv.mkDerivation rec {
7067
"--includedir=${placeholder "dev"}/include"
7168
(lib.enableFeature proxySupport "proxy")
7269
(lib.enableFeature sslSupport "ssl")
73-
(lib.enableFeature modTlsSupport "tls")
7470
(lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2")
7571
"--docdir=$(doc)/share/doc"
7672

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11518,9 +11518,7 @@ with pkgs;
1151811518

1151911519
alerta-server = callPackage ../servers/monitoring/alerta { };
1152011520

11521-
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix {
11522-
inherit (darwin.apple_sdk.frameworks) Foundation;
11523-
};
11521+
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
1152411522
apacheHttpd = apacheHttpd_2_4;
1152511523

1152611524
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {

0 commit comments

Comments
 (0)