From fc4c2e4103653c59b590af6b70a914413c3abd57 Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 6 Apr 2021 10:31:10 +0900 Subject: [PATCH 1/2] loki: format with nixpkgs-fmt --- pkgs/servers/monitoring/loki/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index e27167041c4..f3fb18a862c 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,4 +1,10 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, nixosTests +, systemd }: buildGoModule rec { @@ -32,9 +38,10 @@ buildGoModule rec { passthru.tests = { inherit (nixosTests) loki; }; - 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 - ''; + 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 + ''; doCheck = true; From ba0fe82b781549454141037efad1e301459d889f Mon Sep 17 00:00:00 2001 From: happysalada Date: Tue, 6 Apr 2021 10:53:51 +0900 Subject: [PATCH 2/2] loki: 2.2.0 -> 2.2.1 --- pkgs/servers/monitoring/loki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index f3fb18a862c..83150e42475 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -8,14 +8,14 @@ }: buildGoModule rec { - version = "2.2.0"; + version = "2.2.1"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "sha256-mEu9z3lhHSE0NMXXViX4OBbIiNba7/RPr+AFmIM77g4="; + sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290="; }; vendorSha256 = null;