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

fix(systems/etna): temporarily add package override for cloudflared

Browse source 
https://github.com/NixOS/nixpkgs/pull/390807
This commit is contained in:
uku 2025-03-22 00:52:49 +01:00
parent dc2533f42d
commit b864fa9ffe
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
systems/etna/default.nix
View file

@ -1,5 +1,6 @@
{ {
lib, lib,
pkgs,
config, config,
_utils, _utils,
... ...
@ -7,6 +8,19 @@
let let
tunnelId = "57f51ad7-25a0-45f3-b113-0b6ae0b2c3e5"; 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" ]; }; secrets = _utils.setupSharedSecrets config { secrets = [ "frpToken" ]; };
cfTunnelSecret = _utils.setupSingleSecret config "tunnelCreds" { }; cfTunnelSecret = _utils.setupSingleSecret config "tunnelCreds" { };
in in
@ -75,6 +89,7 @@ in
cloudflared = { cloudflared = {
enable = true; enable = true;
package = pkgs.cloudflared.override { buildGoModule = patchedBuildGoModule; };
tunnels.${tunnelId} = { tunnels.${tunnelId} = {
credentialsFile = cfTunnelSecret.path; credentialsFile = cfTunnelSecret.path;
default = "http_status:404"; default = "http_status:404";