Skip to content

Commit 418ac80

Browse files
committed
cloudflared: mark broken
Signed-off-by: Paul Meyer <[email protected]>
1 parent 58ecd4e commit 418ac80

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

pkgs/applications/networking/cloudflared/default.nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@
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+
1026
buildGoModule rec {
1127
pname = "cloudflared";
1228
version = "2025.2.1";
@@ -91,5 +107,8 @@ buildGoModule rec {
91107
qjoly
92108
];
93109
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;
94113
};
95114
}

pkgs/top-level/all-packages.nix

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,21 +2233,7 @@ with pkgs;
22332233

22342234
cloud-init = python3.pkgs.callPackage ../tools/virtualization/cloud-init { inherit systemd; };
22352235

2236-
cloudflared = callPackage ../applications/networking/cloudflared {
2237-
# https://github.com/cloudflare/cloudflared/issues/1151#issuecomment-1888819250
2238-
buildGoModule = buildGoModule.override {
2239-
go = buildPackages.go_1_22.overrideAttrs {
2240-
pname = "cloudflare-go";
2241-
version = "1.22.2-devel-cf";
2242-
src = fetchFromGitHub {
2243-
owner = "cloudflare";
2244-
repo = "go";
2245-
rev = "ec0a014545f180b0c74dfd687698657a9e86e310";
2246-
sha256 = "sha256-oQQ9Jyh8TphZSCaHqaugTL7v0aeZjyOdVACz86I2KvU=";
2247-
};
2248-
};
2249-
};
2250-
};
2236+
cloudflared = callPackage ../applications/networking/cloudflared { };
22512237

22522238
clingo = callPackage ../applications/science/logic/potassco/clingo.nix { };
22532239

0 commit comments

Comments
 (0)