Skip to content

curl: 8.2.1 -> 8.3.0 #254963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vcunat merged 2 commits into from
Sep 17, 2023
Merged

curl: 8.2.1 -> 8.3.0 #254963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d2fb00
curl: Fix github src url
yayayayaka Sep 13, 2023
a68cead
curl: 8.2.1 -> 8.3.0
yayayayaka Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions pkgs/tools/networking/curl/7.79.1-darwin-no-systemconfiguration.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ 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 727d123e5..f78d8be4a 100644
index b43714da7..7674778b7 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -250,19 +250,6 @@

@@ -250,20 +250,6 @@
#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,
Expand All @@ -42,8 +42,9 @@ index 727d123e5..f78d8be4a 100644
-#if defined(__APPLE__) && !defined(USE_ARES)
-#include <TargetConditionals.h>
-#define USE_RESOLVE_ON_IPS 1
-# if !defined(TARGET_OS_OSX) || TARGET_OS_OSX
-# define CURL_OSX_CALL_COPYPROXIES 1
-# if TARGET_OS_MAC && !(defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) && \
- defined(ENABLE_IPV6)
-# define CURL_MACOS_CALL_COPYPROXIES 1
-# endif
-#endif
-
Expand Down
6 changes: 3 additions & 3 deletions pkgs/tools/networking/curl/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ assert !((lib.count (x: x) [ gnutlsSupport opensslSupport wolfsslSupport rustlsS

stdenv.mkDerivation (finalAttrs: {
pname = "curl";
version = "8.2.1";
version = "8.3.0";

src = fetchurl {
urls = [
"https://curl.haxx.se/download/curl-${finalAttrs.version}.tar.xz"
"https://github.com/curl/curl/releases/download/curl-${finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
"https://github.com/curl/curl/releases/download/curl-${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}/curl-${finalAttrs.version}.tar.xz"
];
hash = "sha256-3TIva9CiDmzr39OI9p6Yw9GDvteSz0cTyKfvSYy6SJQ=";
hash = "sha256-N21id2fWxPBRBattSXsNmrpxEXcN2dmVIlR4IJw36mM=";
};

patches = [
Expand Down