Merge pull request #97568 from maxeaubrey/traefik_2.2.11
traefik: 2.2.8 -> 2.2.11, pin to go 1.14
This commit is contained in:
commit
2511a36527
2 changed files with 10 additions and 7 deletions
|
@ -2,16 +2,16 @@
|
|||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.2.8";
|
||||
version = "2.2.11";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "containous";
|
||||
repo = "traefik";
|
||||
rev = "v${version}";
|
||||
sha256 = "1p2qv8vrjxn5wg41ywxbpaghb8585xmkwr8ih5df4dbdjw2m3k1f";
|
||||
sha256 = "0l93qb0kjbm5gjba0bxfyb5a0n1p54n5crhcsyzgrki4x586lan0";
|
||||
};
|
||||
|
||||
vendorSha256 = "0kz7y64k07vlybzfjg6709fdy7krqlv1gkk01nvhs84sk8bnrcvn";
|
||||
vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -26,9 +26,9 @@ buildGoModule rec {
|
|||
|
||||
CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
|
||||
|
||||
makeFlagsArray+=("-ldflags=\
|
||||
-X github.com/containous/traefik/version.Version=${version} \
|
||||
-X github.com/containous/traefik/version.Codename=$CODENAME")
|
||||
buildFlagsArray+=("-ldflags=\
|
||||
-X github.com/containous/traefik/v2/pkg/version.Version=${version} \
|
||||
-X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME")
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1512,7 +1512,10 @@ in
|
|||
|
||||
caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614
|
||||
caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; };
|
||||
traefik = callPackage ../servers/traefik { };
|
||||
|
||||
# Traefik 2.2 uses go1.14, pinning can be removed with 2.3
|
||||
# https://github.com/containous/traefik/issues/7234#issuecomment-684950612
|
||||
traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; };
|
||||
|
||||
calamares = libsForQt514.callPackage ../tools/misc/calamares {
|
||||
python = python3;
|
||||
|
|
Loading…
Reference in a new issue