Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 88dfc0333a52
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: fd10e3b4b1c7
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 25, 2017

  1. traefik: 1.3.8 -> 1.4.4

    @adisbladis
    adisbladis committed Nov 25, 2017

    Verified

    This commit was signed with the committer’s verified signature.
    veprbl Dmitry Kalinkin
    GPG key ID: 5157B3EC8B2CA333
    Verified
    Learn about vigilant mode
    Copy the full SHA
    dfa4fbb View commit details

  2. Merge pull request #32018 from adisbladis/traefik-1_4_4 

    traefik: 1.3.8 -> 1.4.4
    @Mic92
    Mic92 authored Nov 25, 2017

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Ma27 Maximilian Bosch
    GPG key ID: 091DBF4D1FC46B8E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fd10e3b View commit details
Showing with 7 additions and 12 deletions.
  1. +7 −12 pkgs/servers/traefik/default.nix
19 changes: 7 additions & 12 deletions pkgs/servers/traefik/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
{ stdenv, buildGoPackage, fetchurl, bash, go-bindata}:
{ stdenv, buildGoPackage, fetchFromGitHub, bash, go-bindata}:

buildGoPackage rec {
name = "traefik-${version}";
version = "1.3.8";
version = "1.4.4";

goPackagePath = "github.com/containous/traefik";

src = fetchurl {
url = "https://github.com/containous/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz";
sha256 = "6fce36dd30bb5ae5f91e69f2950f22fe7a74b920e80c6b441a0721122f6a6174";
src = fetchFromGitHub {
owner = "containous";
repo = "traefik";
rev = "v${version}";
sha256 = "114861v8kg77zwnf742n25h7c4fly3i52inqx1kcpqs074rqm1wn";
};

buildInputs = [ go-bindata bash ];
unpackPhase = ''
runHook preUnpack
mkdir traefik
tar -C traefik -xvzf $src
export sourceRoot="traefik"
runHook postUnpack
'';

buildPhase = ''
runHook preBuild