public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
zowoq 2020-09-27 20:13:50 +10:00
parent c25f55e38b
commit 5b09b92a16
2 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/servers/traefik/default.nix
View File

@ -1,21 +1,16 @@
{ stdenv, fetchurl, buildGoModule, go-bindata, nixosTests }: { stdenv, fetchzip, buildGoModule, go-bindata, nixosTests }:
buildGoModule rec { buildGoModule rec {
pname = "traefik"; pname = "traefik";
version = "2.2.11"; version = "2.3.1";
src = fetchurl { src = fetchzip {
url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "00kprbr437ml33bxm4nhxm9vwh6ywrpxvlij7p3r306bfpwa4j3r"; sha256 = "09328yb6pbrikd1dljmf6spg177w1ymqk1i2152m5srd39mc6ixv";
stripRoot = false;
}; };
unpackPhase = '' vendorSha256 = "026yxahwvbw41vf7yfycwmw797fpw19g1nyi1wcxkkkw383v7dsk";
mkdir source
cd source
tar xf $src
'';
vendorSha256 = "06x2mcyp6c1jdf5wz51prhcn071d0580322lcv3x2bxk2grx08i2";
doCheck = false; doCheck = false;
@ -31,8 +26,8 @@ buildGoModule rec {
CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary)
buildFlagsArray+=("-ldflags=\ buildFlagsArray+=("-ldflags=\
-X github.com/containous/traefik/v2/pkg/version.Version=${version} \ -X github.com/traefik/traefik/v2/pkg/version.Version=${version} \
-X github.com/containous/traefik/v2/pkg/version.Codename=$CODENAME") -X github.com/traefik/traefik/v2/pkg/version.Codename=$CODENAME")
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

4
pkgs/top-level/all-packages.nix
View File

@ -1536,9 +1536,7 @@ in
buildGoModule = buildGo114Module; buildGoModule = buildGo114Module;
}; };
# Traefik 2.2 uses go1.14, pinning can be removed with 2.3 traefik = callPackage ../servers/traefik { };
# https://github.com/containous/traefik/issues/7234#issuecomment-684950612
traefik = callPackage ../servers/traefik { buildGoModule = buildGo114Module; };
calamares = libsForQt514.callPackage ../tools/misc/calamares { calamares = libsForQt514.callPackage ../tools/misc/calamares {
python = python3; python = python3;