traefik: 2.2.11 -> 2.3.1
https://github.com/traefik/traefik/releases/tag/v2.3.0 https://github.com/traefik/traefik/releases/tag/v2.3.1
This commit is contained in:
parent
c25f55e38b
commit
5b09b92a16
|
@ -1,21 +1,16 @@
|
|||
{ stdenv, fetchurl, buildGoModule, go-bindata, nixosTests }:
|
||||
{ stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }:
|
||||
|
||||
buildGoModule rec {
|
||||
pname = "traefik";
|
||||
version = "2.2.11";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "00kprbr437ml33bxm4nhxm9vwh6ywrpxvlij7p3r306bfpwa4j3r";
|
||||
src = fetchzip {
|
||||
url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
|
||||
sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv";
|
||||
stripRoot = false;
|
||||
};
|
||||
|
||||
unpackPhase = ''
|
||||
mkdir source
|
||||
cd source
|
||||
tar xf $src
|
||||
'';
|
||||
|
||||
vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2";
|
||||
vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk";
|
||||
|
||||
doCheck = false;
|
||||
|
||||
|
@ -31,8 +26,8 @@ buildGoModule rec {
|
|||
CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
|
||||
|
||||
buildFlagsArray+=("-ldflags=\
|
||||
-X github.com/containous/traefik/v2/pkg/version.Version=${version} \
|
||||
-X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME")
|
||||
-X github.com/traefik/traefik/v2/pkg/version.Version=${version} \
|
||||
-X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME")
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
@ -1536,9 +1536,7 @@ in
|
|||
buildGoModule = buildGo114Module;
|
||||
};
|
||||
|
||||
# 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; };
|
||||
traefik = callPackage ../servers/traefik { };
|
||||
|
||||
calamares = libsForQt514.callPackage ../tools/misc/calamares {
|
||||
python = python3;
|
||||
|
|
Loading…
Reference in a new issue