Merge pull request #29459 from adisbladis/caddy-0_10_9
caddy: 0.10.7 -> 0.10.9
This commit is contained in:
commit
7ef737d9b1
@ -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}
|
||||
|
Loading…
Reference in New Issue
Block a user