From af8a177463c324d3f10dc65abf14d54c6107ed61 Mon Sep 17 00:00:00 2001 From: pancho horrillo Date: Mon, 14 Sep 2020 21:31:08 +0200 Subject: [PATCH] caddy1: fix build (#97988) main.go gets overwritten in order to build caddy with telemetry disabled, but the global variable `run` got neglected, and this in turn broke the test in caddy/main_test.go. This commit fixes that, and build can now complete. (cherry picked from commit c814b0ef2419c80234d8d20f330155621a9e27c8) --- pkgs/servers/caddy/v1.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/caddy/v1.nix b/pkgs/servers/caddy/v1.nix index 8a18904af2c880..dce4eea84b8aed 100644 --- a/pkgs/servers/caddy/v1.nix +++ b/pkgs/servers/caddy/v1.nix @@ -21,9 +21,10 @@ buildGoModule rec { cat << EOF > caddy/main.go package main import "github.com/caddyserver/caddy/caddy/caddymain" + var run = caddymain.Run // replaced for tests func main() { caddymain.EnableTelemetry = false - caddymain.Run() + run() } EOF '';