From 6ea5b5f2c55759ed8df79931912c8a01d86cbc5c Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 7 Apr 2024 18:06:10 +0200 Subject: [PATCH] rustls-ffi: temporarily drop passthru.tests.curl It currently does not build but the situation is being handled upstream. --- pkgs/development/libraries/rustls-ffi/default.nix | 3 ++- pkgs/tools/networking/curl/default.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rustls-ffi/default.nix b/pkgs/development/libraries/rustls-ffi/default.nix index 46c16c9cc437..380405217e3d 100644 --- a/pkgs/development/libraries/rustls-ffi/default.nix +++ b/pkgs/development/libraries/rustls-ffi/default.nix @@ -28,7 +28,8 @@ rustPlatform.buildRustPackage rec { passthru.tests = { apacheHttpd = apacheHttpd.override { modTlsSupport = true; }; - curl = curl.override { opensslSupport = false; rustlsSupport = true; }; + # Currently broken notably because of https://github.com/curl/curl/issues/13248 + # curl = curl.override { opensslSupport = false; rustlsSupport = true; }; }; meta = with lib; { diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index deaede8f9602..6559a5cf4ecb 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -211,7 +211,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.all; # Fails to link against static brotli or gss - broken = stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin"); + broken = (stdenv.hostPlatform.isStatic && (brotliSupport || gssSupport || stdenv.hostPlatform.system == "x86_64-darwin")) || rustlsSupport; pkgConfigModules = [ "libcurl" ]; mainProgram = "curl"; };