From 329d3a931f74b6edc7de4c8229575819ccbcdd94 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Thu, 18 Sep 2025 17:10:58 +0200 Subject: [PATCH 1/2] cmake: backport curl 8.16 compatibility fix Signed-off-by: Sefa Eyeoglu --- ...ocumented-type-for-CURLOPT_PROXYTYPE-values.diff | 13 +++++++++++++ pkgs/by-name/cm/cmake/package.nix | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff diff --git a/pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff b/pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff new file mode 100644 index 000000000000..feabba28b0d6 --- /dev/null +++ b/pkgs/by-name/cm/cmake/009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff @@ -0,0 +1,13 @@ +diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h +index 7836f4b9c78a1d103eee515d618856a6712b4480..9113890b5a12cb157b691b66d96e25d0fd4b50ef 100644 +--- a/Source/CTest/cmCTestCurl.h ++++ b/Source/CTest/cmCTestCurl.h +@@ -52,7 +52,7 @@ private: + std::vector HttpHeaders; + std::string HTTPProxyAuth; + std::string HTTPProxy; +- curl_proxytype HTTPProxyType; ++ long HTTPProxyType; + bool UseHttp10 = false; + bool Quiet = false; + int TimeOutSeconds = 0; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index 8f2f690f90aa..32b00795f366 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -75,6 +75,9 @@ stdenv.mkDerivation (finalAttrs: { # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9900 # Needed to correctly link curl in pkgsStatic. ./008-FindCURL-Add-more-target-properties-from-pkg-config.diff + # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134 + # Fixes build against curl 8.16 and later + ./009-cmCTestCurl-Avoid-using-undocumented-type-for-CURLOPT_PROXYTYPE-values.diff ]; outputs = [ From 63dbf8ee09113cb1c5d3af8f78e4c4e3d30ba089 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Wed, 16 Jul 2025 08:46:48 +0200 Subject: [PATCH 2/2] curlMinimal: 8.14.1 -> 8.16.0 https://daniel.haxx.se/blog/2025/07/16/curl-8-15-0/ https://curl.se/ch/8.15.0.html https://github.com/curl/curl/releases/tag/curl-8_15_0 https://daniel.haxx.se/blog/2025/07/16/curl-8-16-0/ https://curl.se/ch/8.16.0.html https://github.com/curl/curl/releases/tag/curl-8_16_0 Signed-off-by: Sefa Eyeoglu --- pkgs/by-name/cu/curlMinimal/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index a2d1835da18e..cf05a5a8362f 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.14.1"; + version = "8.16.0"; src = fetchurl { urls = [ @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-9GGaHiR0xLv+3IinwhkSCcgzS0j6H05T/VhMwS6RIN0="; + hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion