Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7a6123a074c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ad6f4005b8a2
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 26, 2019

  1. caddy: disable telemetry 

    Co-authored-by: Franz Pletz <fpletz@fnordicwalking.de>
    @marsam @fpletz
    marsam and fpletz committed Oct 26, 2019
    Copy the full SHA
    b53710e View commit details

Commits on Oct 28, 2019

  1. Merge pull request #63697 from marsam/caddy-disable-telemetry 

    caddy: disable telemetry
    @fpletz
    fpletz authored Oct 28, 2019
    Copy the full SHA
    ad6f400 View commit details
Showing with 9 additions and 3 deletions.
  1. +9 −3 pkgs/servers/caddy/default.nix
12 changes: 9 additions & 3 deletions pkgs/servers/caddy/default.nix
View file
Original file line number Diff line number Diff line change
@@ -16,9 +16,15 @@ buildGoModule rec {
};
modSha256 = "0np0mbs0mrn8scqa0dgvi7ya1707b3883prdaf1whsqrcr71ig8q";

buildFlagsArray = ''
-ldflags=
-s -w -X github.com/caddyserver/caddy/caddy/caddymain.gitTag=v${version}
preBuild = ''
cat << EOF > caddy/main.go
package main
import "github.com/caddyserver/caddy/caddy/caddymain"
func main() {
caddymain.EnableTelemetry = false
caddymain.Run()
}
EOF
'';

meta = with stdenv.lib; {