Skip to content

curl: 8.1.2 -> 8.2.0 #244468

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 1 commit into from
Jul 26, 2023
Merged

curl: 8.1.2 -> 8.2.0 #244468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 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,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>

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 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.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 = [
Expand Down