From bfc6a10efb6021a510d8ea12810369b2869fef34 Mon Sep 17 00:00:00 2001 From: Piper McCorkle Date: Fri, 7 Nov 2025 11:37:22 -0600 Subject: [PATCH 1/3] cloudflared: 2025.10.1 -> 2025.11.1 --- pkgs/by-name/cl/cloudflared/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index f666fc411b1d..551c6487b263 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2025.10.1"; + version = "2025.11.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = version; - hash = "sha256-5GEvmal1ZaUp1wOEsjngDSXj9AuAm1PyUw92xq/YT58="; + hash = "sha256-OspDwmh8rzGaHlLfQiUxQzDNxBdzkBJbPrmL1YN7BtM="; }; vendorHash = null; From c26566b004155db6c2e21ef72642b0049442457a Mon Sep 17 00:00:00 2001 From: Piper McCorkle Date: Fri, 7 Nov 2025 11:37:22 -0600 Subject: [PATCH 2/3] cloudflared: fix deprecation warnings for test patches, fix passthru --- pkgs/by-name/cl/cloudflared/package.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 551c6487b263..3d001896e83d 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -34,46 +34,46 @@ buildGoModule rec { # Workaround for: protocol_test.go:11: # lookup protocol-v2.argotunnel.com on [::1]:53: read udp [::1]:51876->[::1]:53: read: connection refused substituteInPlace "edgediscovery/protocol_test.go" \ - --replace "TestProtocolPercentage" "SkipProtocolPercentage" + --replace-warn "TestProtocolPercentage" "SkipProtocolPercentage" # Workaround for: origin_icmp_proxy_test.go:46: # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestICMPRouterEcho" "SkipICMPRouterEcho" + --replace-warn "TestICMPRouterEcho" "SkipICMPRouterEcho" # Workaround for: origin_icmp_proxy_test.go:110: # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst" + --replace-warn "TestConcurrentRequestsToSameDst" "SkipConcurrentRequestsToSameDst" # Workaround for: origin_icmp_proxy_test.go:242: # cannot create ICMPv4 proxy: socket: permission denied nor ICMPv6 proxy: socket: permission denied substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho" + --replace-warn "TestICMPRouterRejectNotEcho" "SkipICMPRouterRejectNotEcho" # Workaround for: origin_icmp_proxy_test.go:108: # Received unexpected error: cannot create ICMPv4 proxy: Group ID 100 is not between ping group 65534 to 65534 nor ICMPv6 proxy: socket: permission denied substituteInPlace "ingress/origin_icmp_proxy_test.go" \ - --replace "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho" + --replace-warn "TestTraceICMPRouterEcho" "SkipTraceICMPRouterEcho" # Workaround for: icmp_posix_test.go:28: socket: permission denied substituteInPlace "ingress/icmp_posix_test.go" \ - --replace "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout" + --replace-warn "TestFunnelIdleTimeout" "SkipFunnelIdleTimeout" # Workaround for: icmp_posix_test.go:88: Received unexpected error: Group ID 100 is not between ping group 65534 to 65534 substituteInPlace "ingress/icmp_posix_test.go" \ - --replace "TestReuseFunnel" "SkipReuseFunnel" + --replace-warn "TestReuseFunnel" "SkipReuseFunnel" # Workaround for: manager_test.go:197: # Should be false substituteInPlace "datagramsession/manager_test.go" \ - --replace "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" + --replace-warn "TestManagerCtxDoneCloseSessions" "SkipManagerCtxDoneCloseSessions" ''; doCheck = !stdenv.hostPlatform.isDarwin; passthru = { - tests.simple = callPackage ./tests.nix { inherit version; }; + tests = callPackage ./tests.nix { inherit version; }; updateScript = gitUpdater { }; }; From 5216a669c85d5ac1dc9f98d5f6d58fe1793e3b41 Mon Sep 17 00:00:00 2001 From: Piper McCorkle Date: Fri, 7 Nov 2025 11:37:22 -0600 Subject: [PATCH 3/3] cloudflared: update metadata with new description & links --- pkgs/by-name/cl/cloudflared/package.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 3d001896e83d..49191ae7c8a2 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -78,9 +78,24 @@ buildGoModule rec { }; meta = { - description = "Cloudflare Tunnel daemon, Cloudflare Access toolkit, and DNS-over-HTTPS client"; + description = "Client for various Cloudflare services, including Tunnel, Access, and DNS over HTTPS"; + longDescription = '' + Contains the command-line client for Cloudflare Tunnel, a tunneling daemon that proxies traffic from the Cloudflare network to your origins. + This daemon sits between Cloudflare network and your origin (e.g. a webserver). Cloudflare attracts client requests and sends them to you + via this daemon, without requiring you to poke holes on your firewall --- your origin can remain as closed as possible. + Extensive documentation can be found in the [Cloudflare Tunnel section](https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel) of the Cloudflare Docs. + All usages related with proxying to your origins are available under `cloudflared tunnel help`. + + You can also use `cloudflared` to access Tunnel origins (that are protected with `cloudflared tunnel`) for TCP traffic + at Layer 4 (i.e., not HTTP/websocket), which is relevant for use cases such as SSH, RDP, etc. + Such usages are available under `cloudflared access help`. + + You can instead use [WARP client](https://developers.cloudflare.com/cloudflare-one/team-and-resources/devices/warp/) (`pkgs.cloudflare-warp` or `services.cloudflare-warp` on NixOS) + to access private origins behind Tunnels for Layer 4 traffic without requiring `cloudflared access` commands on the client side. + ''; homepage = "https://www.cloudflare.com/products/tunnel"; - changelog = "https://github.com/cloudflare/cloudflared/releases/tag/${version}"; + downloadPage = "https://developers.cloudflare.com/cloudflare-one/networks/connectors/cloudflare-tunnel/downloads/"; + changelog = "https://raw.githubusercontent.com/cloudflare/cloudflared/refs/tags/${version}/RELEASE_NOTES"; license = lib.licenses.asl20; platforms = lib.platforms.unix ++ lib.platforms.windows; maintainers = with lib.maintainers; [