From b864fa9ffee9af08c5c406d50d29e8c0fa187703 Mon Sep 17 00:00:00 2001 From: uku Date: Sat, 22 Mar 2025 00:52:49 +0100 Subject: [PATCH] fix(systems/etna): temporarily add package override for cloudflared https://github.com/NixOS/nixpkgs/pull/390807 --- systems/etna/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/systems/etna/default.nix b/systems/etna/default.nix index 6064d03..3f0a702 100644 --- a/systems/etna/default.nix +++ b/systems/etna/default.nix @@ -1,5 +1,6 @@ { lib, + pkgs, config, _utils, ... @@ -7,6 +8,19 @@ let tunnelId = "57f51ad7-25a0-45f3-b113-0b6ae0b2c3e5"; + patchedBuildGoModule = pkgs.buildGoModule.override { + go = pkgs.buildPackages.go_1_22.overrideAttrs { + pname = "cloudflare-go"; + version = "1.22.5-devel-cf"; + src = pkgs.fetchFromGitHub { + owner = "cloudflare"; + repo = "go"; + rev = "af19da5605ca11f85776ef7af3384a02a315a52b"; + hash = "sha256-6VT9CxlHkja+mdO1DeFoOTq7gjb3T5jcf2uf9TB/CkU="; + }; + }; + }; + secrets = _utils.setupSharedSecrets config { secrets = [ "frpToken" ]; }; cfTunnelSecret = _utils.setupSingleSecret config "tunnelCreds" { }; in @@ -75,6 +89,7 @@ in cloudflared = { enable = true; + package = pkgs.cloudflared.override { buildGoModule = patchedBuildGoModule; }; tunnels.${tunnelId} = { credentialsFile = cfTunnelSecret.path; default = "http_status:404";