uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(systems/etna): unbreak cloudflared (the horrors)

Browse source
This commit is contained in:
uku 2025-04-03 15:12:05 +02:00
parent b271bbf0e8
commit 80c28d4f3b
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
2 changed files with 45 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
systems/etna/default.nix
View file

@ -8,16 +8,27 @@
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=";
};
patchedCloudflared = pkgs.cloudflared.override {
buildGoModule = pkgs.buildGoModule.override {
go = pkgs.buildPackages.go_1_23.overrideAttrs (old: {
pname = "cloudflare-go";
version = "1.22.5-devel-cf";
src = pkgs.fetchFromGitHub {
owner = "cloudflare";
repo = "go";
rev = "af19da5605ca11f85776ef7af3384a02a315a52b";
hash = "sha256-6VT9CxlHkja+mdO1DeFoOTq7gjb3T5jcf2uf9TB/CkU=";
};
patches = map (
patch:
if (baseNameOf patch == "go_no_vendor_checks-1.23.patch") then
../../exprs/go-no-vendor-1.22.patch
else
patch
) old.patches;
});
};
};
@ -89,7 +100,7 @@ in
cloudflared = {
enable = true;
package = pkgs.cloudflared.override { buildGoModule = patchedBuildGoModule; };
package = patchedCloudflared.overrideAttrs { meta.broken = false; };
tunnels.${tunnelId} = {
credentialsFile = cfTunnelSecret.path;
default = "http_status:404";