Skip to content

Commit 82541d0

Browse files
authored
cloudflared: 2025.2.1 -> 2025.4.0 (NixOS#395713)
2 parents e84430c + cf1af04 commit 82541d0

File tree

1 file changed

+3
-21
lines changed

1 file changed

+3
-21
lines changed

pkgs/applications/networking/cloudflared/default.nix

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,15 @@
77
gitUpdater,
88
}:
99

10-
let
11-
# https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
12-
# buildGoModule = buildGoModule.override {
13-
# go = buildPackages.go_1_22.overrideAttrs {
14-
# pname = "cloudflare-go";
15-
# version = "1.22.2-devel-cf";
16-
# src = fetchFromGitHub {
17-
# owner = "cloudflare";
18-
# repo = "go";
19-
# rev = "ec0a014545f180b0c74dfd687698657a9e86e310";
20-
# sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU=";
21-
# };
22-
# };
23-
# };
24-
in
25-
2610
buildGoModule rec {
2711
pname = "cloudflared";
28-
version = "2025.2.1";
12+
version = "2025.4.0";
2913

3014
src = fetchFromGitHub {
3115
owner = "cloudflare";
3216
repo = "cloudflared";
3317
tag = version;
34-
hash = "sha256-RiHEUs1I9ErYBQF28la6kqU3BW968PVT+K7uGUVr6Ec=";
18+
hash = "sha256-PKF7wP/ueLLhV8k3nMUm/c5fkg+7CwRf1oLnx0qbcA0=";
3519
};
3620

3721
vendorHash = null;
@@ -105,10 +89,8 @@ buildGoModule rec {
10589
thoughtpolice
10690
piperswe
10791
qjoly
92+
wrbbz
10893
];
10994
mainProgram = "cloudflared";
110-
# cloudflared requires a fork of go 1.22 to build (see override above),
111-
# but go 1.22 is EOL and the toolchain has been removed from nixpkgs.
112-
broken = true;
11395
};
11496
}

0 commit comments

Comments
 (0)