diff options
Diffstat (limited to 'pkgs/tools/networking/curl/default.nix')
| -rw-r--r-- | pkgs/tools/networking/curl/default.nix | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 02ae74bd633..66d2dfcdb9a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -62,18 +62,21 @@ assert zstdSupport -> zstd != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.83.0"; + version = "7.83.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-JHx+x1IcQljmVjTlKScNIU/jKWmXHMy3KEXnqkaDH5Y="; + sha256 = "sha256-9Tmjb7RKgmDsXZd+Tg290u7intkPztqpvDyfeKETv/A="; }; patches = [ ./7.79.1-darwin-no-systemconfiguration.patch + # quiche: support ca-fallback + # https://github.com/curl/curl/commit/fdb5e21b4dd171a96cf7c002ee77bb08f8e58021 + ./7.83.1-quiche-support-ca-fallback.patch ]; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; @@ -141,15 +144,24 @@ stdenv.mkDerivation rec { ] ++ lib.optionals stdenv.isDarwin [ # Disable default CA bundle, use NIX_SSL_CERT_FILE or fallback to nss-cacert from the default profile. # Without this curl might detect /etc/ssl/cert.pem at build time on macOS, causing curl to ignore NIX_SSL_CERT_FILE. - # https://github.com/curl/curl/issues/8696 - fallback is not supported by HTTP3 - (if http3Support then "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" else "--without-ca-bundle") + "--without-ca-bundle" "--without-ca-path" ]; CXX = "${stdenv.cc.targetPrefix}c++"; CXXCPP = "${stdenv.cc.targetPrefix}c++ -E"; - doCheck = false; # expensive, fails + doCheck = true; + preCheck = '' + patchShebangs tests/ + '' + lib.optionalString stdenv.isDarwin '' + # bad interaction with sandbox if enabled? + rm tests/data/test1453 + rm tests/data/test1086 + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + # different resolving behaviour? + rm tests/data/test1592 + ''; postInstall = '' moveToOutput bin/curl-config "$dev" |