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

Commits on Nov 21, 2019

  1. grafana-loki: 0.4.0 -> 1.0.0 

    Adding mmahut as maintaner
    @mmahut
    mmahut committed Nov 21, 2019
    Copy the full SHA
    693c27b View commit details

Commits on Nov 22, 2019

  1. Merge pull request #73862 from mmahut/loki 

    grafana-loki: 0.4.0 -> 1.0.0
    @mmahut
    mmahut authored Nov 22, 2019

    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
    9522139 View commit details
Showing with 4 additions and 4 deletions.
  1. +4 −4 pkgs/servers/monitoring/loki/default.nix
8 changes: 4 additions & 4 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 = "0.4.0";
version = "1.0.0";
pname = "grafana-loki";
goPackagePath = "github.com/grafana/loki";

@@ -11,7 +11,7 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "1anwq5dbh29dma18hnialbb253ciazzxmnqvympbh29ricldcf8p";
sha256 = "0qqmxrbiph268i5c8i6wpcihspdcglfxd4hy6ag03bl66rciq8nb";
};

nativeBuildInputs = [ makeWrapper ];
@@ -23,10 +23,10 @@ buildGoPackage rec {
'';

meta = with stdenv.lib; {
description = "Like Prometheus, but for logs.";
description = "Like Prometheus, but for logs";
license = licenses.asl20;
homepage = "https://grafana.com/loki";
maintainers = with maintainers; [ willibutz globin ];
maintainers = with maintainers; [ willibutz globin mmahut ];
platforms = platforms.linux;
};
}