BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

grafana-loki: 2.2.1 -> 2.3.0 (#133011)

Browse source 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
This commit is contained in:
Raphael Megzari 2021-08-08 12:31:09 +09:00 committed by GitHub
parent ed08064b21
commit 42b315fa79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkgs/servers/monitoring/loki/default.nix
View file

@ -8,14 +8,14 @@
}: }:
buildGoModule rec { buildGoModule rec {
version = "2.2.1"; version = "2.3.0";
pname = "grafana-loki"; pname = "grafana-loki";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "loki"; repo = "loki";
sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290="; sha256 = "sha256-Cxg3VRF4p/Kb6LyreGV0g+zPr15wplritSZgkbTiDI0=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -24,7 +24,7 @@ buildGoModule rec {
# TODO split every executable into its own package # TODO split every executable into its own package
"cmd/loki" "cmd/loki"
"cmd/loki-canary" "cmd/loki-canary"
"cmd/promtail" "clients/cmd/promtail"
"cmd/logcli" "cmd/logcli"
]; ];
@ -38,16 +38,21 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) loki; }; passthru.tests = { inherit (nixosTests) loki; };
buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in ldflags = let t = "github.com/grafana/loki/pkg/util/build"; in [
'' "-s"
-ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown "-w"
''; "-X ${t}.Version=${version}"
"-X ${t}.BuildUser=nix@nixpkgs"
"-X ${t}.BuildDate=unknown"
"-X ${t}.Branch=unknown"
"-X ${t}.Revision=unknown"
];
doCheck = true; doCheck = true;
meta = with lib; { meta = with lib; {
description = "Like Prometheus, but for logs"; description = "Like Prometheus, but for logs";
license = licenses.asl20; license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/"; homepage = "https://grafana.com/oss/loki/";
maintainers = with maintainers; [ willibutz globin mmahut ]; maintainers = with maintainers; [ willibutz globin mmahut ];
platforms = platforms.unix; platforms = platforms.unix;

2
pkgs/top-level/all-packages.nix
View file

@ -19746,7 +19746,7 @@ in
grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; grafana-agent = callPackage ../servers/monitoring/grafana-agent { };
grafana-loki = callPackage ../servers/monitoring/loki { grafana-loki = callPackage ../servers/monitoring/loki {
buildGoModule = buildGo115Module; buildGoModule = buildGo116Module;
}; };
grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { };