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: d5086db3c05e
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9894a1b4c25b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 22, 2020

  1. grafana-loki: 1.2.0 -> 1.3.0, patch distributor test 

    Only include the loopback interface "lo" in the lifecycler configuration
of the distributor test.
    @WilliButz
    WilliButz committed Jan 22, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    WilliButz
    GPG key ID: 92582A10F1179CB2
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    96de24c View commit details

  2. Merge pull request #78331 from WilliButz/update-loki 

    grafana-loki: 1.2.0 -> 1.3.0, patch distributor test
    @Ma27
    Ma27 authored Jan 22, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9894a1b View commit details
Showing with 8 additions and 2 deletions.
  1. +8 −2 pkgs/servers/monitoring/loki/default.nix
10 changes: 8 additions & 2 deletions pkgs/servers/monitoring/loki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }:

buildGoPackage rec {
version = "1.2.0";
version = "1.3.0";
pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";

@@ -11,9 +11,15 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "04ix58gb9yy5jf8fhn3k1pbwqs69k7m96cck38ymhwml1793b4k9";
sha256 = "0b1dpb3vh5i18467qk8kpb5ic14p4p1dfyr8hjkznf6bs7g8ka1q";
};

postPatch = ''
substituteInPlace pkg/distributor/distributor_test.go --replace \
'"eth0", "en0", "lo0"' \
'"lo"'
'';

nativeBuildInputs = [ makeWrapper ];
buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ];