diff options
| author | pancho horrillo <pancho@pancho.name> | 2020-09-14 21:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-14 19:31:08 +0000 |
| commit | c814b0ef2419c80234d8d20f330155621a9e27c8 (patch) | |
| tree | fdd6a14d51d54e8684038b3dfa46091de9a42b41 /pkgs/servers/caddy | |
| parent | 10e2e5be3063a4264226da41d4d11ac1a7710500 (diff) | |
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.
Diffstat (limited to 'pkgs/servers/caddy')
| -rw-r--r-- | pkgs/servers/caddy/v1.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/servers/caddy/v1.nix b/pkgs/servers/caddy/v1.nix index 8a18904af2c8..dce4eea84b8a 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 ''; |