diff --git a/pkgs/by-name/ru/rustls-ffi/package.nix b/pkgs/by-name/ru/rustls-ffi/package.nix index e5317b40b78c..7dd4fe038f0e 100644 --- a/pkgs/by-name/ru/rustls-ffi/package.nix +++ b/pkgs/by-name/ru/rustls-ffi/package.nix @@ -15,19 +15,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "rustls-ffi"; - version = "0.13.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "rustls"; repo = "rustls-ffi"; rev = "v${finalAttrs.version}"; - hash = "sha256-Bc9bVZ2pDsG118l/SlElZpgh9F1JEgPF8LzBX7d4mhE="; + hash = "sha256-ZKAyKcKwhnPE6PrfBFjLJKkTlGbdLcmW1EP/xSv2cpM="; }; cargoDeps = rustPlatform.fetchCargoTarball { src = finalAttrs.src; name = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-gDQ9AFrJuV7SrzKCAHQBkKj6clXuPLO0DHhnvcBqRLs="; + hash = "sha256-IaOhQfDEgLhGmes0xzhLVym29aP691TY0EXdOIgXEMA="; }; propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security ]; @@ -54,7 +54,6 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { curl = curl.override { opensslSupport = false; rustlsSupport = true; rustls-ffi = finalAttrs.finalPackage; }; - apacheHttpd = apacheHttpd.override { modTlsSupport = true; rustls-ffi = finalAttrs.finalPackage; }; pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; }; diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 2d9ac45b8e82..304ff008348b 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -2,7 +2,6 @@ , nixosTests , proxySupport ? true , sslSupport ? true, openssl -, modTlsSupport ? false, rustls-ffi, Foundation , http2Support ? true, nghttp2 , ldapSupport ? true, openldap , libxml2Support ? true, libxml2 @@ -40,8 +39,6 @@ stdenv.mkDerivation rec { buildInputs = [ perl libxcrypt zlib ] ++ lib.optional brotliSupport brotli ++ 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 libxml2Support libxml2 ++ lib.optional http2Support nghttp2 ++ @@ -70,7 +67,6 @@ stdenv.mkDerivation rec { "--includedir=${placeholder "dev"}/include" (lib.enableFeature proxySupport "proxy") (lib.enableFeature sslSupport "ssl") - (lib.enableFeature modTlsSupport "tls") (lib.withFeatureAs libxml2Support "libxml2" "${libxml2.dev}/include/libxml2") "--docdir=$(doc)/share/doc" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b261a4a55e..9da928807c95 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11514,9 +11514,7 @@ with pkgs; alerta-server = callPackage ../servers/monitoring/alerta { }; - apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { - inherit (darwin.apple_sdk.frameworks) Foundation; - }; + apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { }; apacheHttpd = apacheHttpd_2_4; apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {