diff options
| author | adisbladis <adis@blad.is> | 2017-09-16 16:54:47 +0800 |
|---|---|---|
| committer | adisbladis <adis@blad.is> | 2017-09-16 16:54:47 +0800 |
| commit | 9ede0dea452d4512316f2db2f865b76158bf991f (patch) | |
| tree | 13e21f6c39041475099cf9b0107675758408bfc4 /pkgs/servers/caddy/default.nix | |
| parent | 7af36040e80c500679a58ff0549a1b582cc740fa (diff) | |
| download | nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar.gz nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar.bz2 nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar.lz nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar.xz nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.tar.zst nixpkgs-9ede0dea452d4512316f2db2f865b76158bf991f.zip | |
caddy: 0.10.7 -> 0.10.9
Diffstat (limited to 'pkgs/servers/caddy/default.nix')
| -rw-r--r-- | pkgs/servers/caddy/default.nix | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index d4036b52d96..24f5cec8179 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch }: buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.7"; + version = "0.10.9"; goPackagePath = "github.com/mholt/caddy"; @@ -12,9 +12,19 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "1sn959l2cq6pallmngwf1hrjk7qrsfb5wsqbv15xnczl22lvwf13"; + sha256 = "1shry7dqcbb5d3hp9xz5l3jx9a6i18wssz3m28kpjf3cks427v55"; }; + patches = [ + # This header was added in 0.10.9 and was since reverted but no new release made + # remove this patch when updating to next release + (fetchpatch { + url = "https://github.com/mholt/caddy/commit/d267b62fe9fdd008f13774afc72d95335934d133.patch"; + name = "revert-sponsors-header.patch"; + sha256 = "192g23kzkrwgif7ii9c70mh1a25gwhm1l1mzyqm9i0d3jifsfc2j"; + }) + ]; + buildFlagsArray = '' -ldflags= -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} |