diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-04-13 17:16:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-13 17:16:54 +0100 |
commit | 4c3f1d321aa9292f59455099c7107f42ac9b3c47 (patch) | |
tree | 23f160e6b285366f2353e986623a65a68b52ae11 /pkgs | |
parent | 56f78c1ca444f0b85bea9ea5d3fb37c0f9487225 (diff) | |
parent | 9360e3723dd9a0c3aa13000bfce2ccc2a974a27e (diff) | |
download | nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar.gz nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar.bz2 nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar.lz nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar.xz nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.tar.zst nixlib-4c3f1d321aa9292f59455099c7107f42ac9b3c47.zip |
Merge pull request #76723 from jokogr/u/traefik-2.1.1
Traefik: 1.7.14 -> 2.2.0
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/servers/traefik/default.nix | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index d2a784cdf131..0487ed177d04 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -1,39 +1,37 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}: +{ stdenv, buildGoModule, fetchFromGitHub, go-bindata, nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "traefik"; - version = "1.7.14"; - - goPackagePath = "github.com/containous/traefik"; + version = "2.2.0"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1j3p09j8rpdkp8v4d4mz224ddakkvhzchvccm9qryrqc2fq4022v"; + sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92"; }; - nativeBuildInputs = [ go-bindata bash ]; - - buildPhase = '' - runHook preBuild - ( - cd go/src/github.com/containous/traefik - bash ./script/make.sh generate - - CODENAME=$(awk -F "=" '/CODENAME=/ { print $2}' script/binary) - go build -ldflags "\ - -X github.com/containous/traefik/version.Version=${version} \ - -X github.com/containous/traefik/version.Codename=$CODENAME \ - " -a -o $bin/bin/traefik ./cmd/traefik - ) - runHook postBuild + modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx"; + subPackages = [ "cmd/traefik" ]; + + nativeBuildInputs = [ go-bindata ]; + + passthru.tests = { inherit (nixosTests) traefik; }; + + preBuild = '' + go generate + + 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") ''; meta = with stdenv.lib; { homepage = "https://traefik.io"; description = "A modern reverse proxy"; license = licenses.mit; - maintainers = with maintainers; [ hamhut1066 vdemeester ]; + maintainers = with maintainers; [ vdemeester ]; }; } |