public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #118638 from happysalada/update_loki

Browse Source
This commit is contained in:
Sandro 2021-04-06 10:26:34 +02:00 committed by GitHub
commit 936efbb5dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/servers/monitoring/loki/default.nix
View File

@ -1,15 +1,21 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd { stdenv
, lib
, buildGoModule
, fetchFromGitHub
, makeWrapper
, nixosTests
, systemd
}: }:
buildGoModule rec { buildGoModule rec {
version = "2.2.0"; version = "2.2.1";
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-mEu9z3lhHSE0NMXXViX4OBbIiNba7/RPr+AFmIM77g4="; sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -32,9 +38,10 @@ buildGoModule rec {
passthru.tests = { inherit (nixosTests) loki; }; passthru.tests = { inherit (nixosTests) loki; };
buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in '' buildFlagsArray = let t = "github.com/grafana/loki/pkg/build"; in
-ldflags=-s -w -X ${t}.Version=${version} -X ${t}.BuildUser=nix@nixpkgs -X ${t}.BuildDate=unknown -X ${t}.Branch=unknown -X ${t}.Revision=unknown ''
''; -ldflags=-s -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;