File tree Expand file tree Collapse file tree 2 files changed +20
-15
lines changed
applications/networking/cloudflared Expand file tree Collapse file tree 2 files changed +20
-15
lines changed Original file line number Diff line number Diff line change 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+
1026buildGoModule 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}
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments