Merge #244468: curl: 8.1.2 -> 8.2.0

...into staging
This commit is contained in:
Vladimír Čunát 2023-07-26 18:57:13 +02:00
commit 1e243bd1bb
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 5 additions and 5 deletions

View File

@ -27,10 +27,10 @@ autoconf in the bootstrap loop just to regenerate a patched configure.ac.
curl_includes_winsock2="\
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 99048c489..19abfbbac 100644
index 727d123e5..f78d8be4a 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -247,19 +247,6 @@
@@ -250,19 +250,6 @@
#include <curl/system.h>
@ -42,7 +42,7 @@ index 99048c489..19abfbbac 100644
-#if defined(__APPLE__) && !defined(USE_ARES)
-#include <TargetConditionals.h>
-#define USE_RESOLVE_ON_IPS 1
-# if defined(TARGET_OS_OSX) && TARGET_OS_OSX
-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
-# define CURL_OSX_CALL_COPYPROXIES 1
-# endif
-#endif

View File

@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS
stdenv.mkDerivation (finalAttrs: {
pname = "curl";
version = "8.1.2";
version = "8.2.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"
];
hash = "sha256-tUl00y/WEKys6S498fZDFEAVrGWEfwoEH9wX229D8kM=";
hash = "sha256-CAqqW+8pqz9ZIQHnqV8y3b6IuSElyyjd5HnVoQSSjqQ=";
};
patches = [