diff options
author | Mario Rodas <marsam@users.noreply.github.com> | 2020-10-31 11:28:05 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-31 11:28:05 -0500 |
commit | 2faef8261071d2ebf98c55702d65cfec65c33f5a (patch) | |
tree | b7101db91acf74b727bcfded9039da5240b88f37 /pkgs/servers/monitoring | |
parent | 76165535700f917ecb057092e0bbe0e1391ad2a3 (diff) | |
parent | 09bbd4017fa5a6c76cc586b331a439c2ab7c9556 (diff) |
Merge pull request #101986 from mweinelt/loki2
grafana-loki: 1.6.1 -> 2.0.0
Diffstat (limited to 'pkgs/servers/monitoring')
-rw-r--r-- | pkgs/servers/monitoring/loki/default.nix | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index ec9d56f2cbb7..c4bfeed8c88d 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,24 +1,28 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, systemd, fetchpatch }: -buildGoPackage rec { - version = "1.6.1"; +buildGoModule rec { + version = "2.0.0"; pname = "grafana-loki"; - goPackagePath = "github.com/grafana/loki"; - - doCheck = true; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "0bakskzizazc5cd6km3n6facc5val5567zinnxg3yjy29xdi64ww"; + sha256 = "09a0mqdmk754vigd1xqijzwazwrmfaqcgdr2c6dz25p7a65568hj"; }; - postPatch = '' - substituteInPlace pkg/distributor/distributor_test.go --replace \ - '"eth0", "en0", "lo0"' \ - '"lo"' - ''; + vendorSha256 = null; + + subPackages = [ "..." ]; + + patches = [ + (fetchpatch { + # Fix expected return value in Test_validateDropConfig + # https://github.com/grafana/loki/issues/2519 + url = "https://github.com/grafana/loki/commit/1316c0f0c5cda7c272c4873ea910211476fc1db8.patch"; + sha256 = "06hwga58qpmivbhyjgyqzb75602hy8212a4b5vh99y9pnn6c913h"; + }) + ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; @@ -28,6 +32,8 @@ buildGoPackage rec { --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; + doCheck = true; + meta = with stdenv.lib; { description = "Like Prometheus, but for logs"; license = licenses.asl20; |