Merge #197843: curl: 7.85.0 -> 7.86.0

...into staging
This commit is contained in:
Vladimír Čunát 2022-10-28 10:45:41 +02:00
commit 6ec4b657f8
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 5 deletions

View File

@ -31,9 +31,9 @@ index 99048c489..19abfbbac 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -247,19 +247,6 @@
# include "setup-win32.h"
#endif
#include <curl/system.h>
-/*
- * Use getaddrinfo to resolve the IPv4 address literal. If the current network
- * interface doesn't support IPv4, but supports IPv6, NAT64, and DNS64,

View File

@ -47,14 +47,14 @@ assert !(opensslSupport && wolfsslSupport);
stdenv.mkDerivation (finalAttrs: {
pname = "curl";
version = "7.85.0";
version = "7.86.0";
src = fetchurl {
urls = [
"https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.bz2"
"https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.bz2"
];
sha256 = "sha256-IafoNijulhZKwrNv9r+Z1GfHsLYhwffjF9jw2WARU5w=";
sha256 = "sha256-9cpp2wPuoX+ocFvfsan1jXakbJAQUYEJuzjzExN+Cig=";
};
patches = [