pyrox.dev / nixpkgs
lol
fork atom

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.

pancho horrillo c814b0ef 10e2e5be

options
unified split
Changed files
+2 -1
pkgs
servers
caddy
v1.nix
+2 -1
pkgs/servers/caddy/v1.nix 
···

       
21

       
21

       
 

       
    cat << EOF > caddy/main.go


     

       
22

       
22

       
 

       
    package main


     

       
23

       
23

       
 

       
    import "github.com/caddyserver/caddy/caddy/caddymain"


     

       

       
24

       
+

       
    var run = caddymain.Run // replaced for tests


     

       
24

       
25

       
 

       
    func main() {


     

       
25

       
26

       
 

       
      caddymain.EnableTelemetry = false


     

       
26

       

       
-

       
      caddymain.Run()


     

       

       
27

       
+

       
      run()


     

       
27

       
28

       
 

       
    }


     

       
28

       
29

       
 

       
    EOF


     

       
29

       
30

       
 

       
  '';