diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/monitoring/loki/default.nix')
-rw-r--r-- | nixpkgs/pkgs/servers/monitoring/loki/default.nix | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/servers/monitoring/loki/default.nix b/nixpkgs/pkgs/servers/monitoring/loki/default.nix index 99f83e1bfbd3..83150e424758 100644 --- a/nixpkgs/pkgs/servers/monitoring/loki/default.nix +++ b/nixpkgs/pkgs/servers/monitoring/loki/default.nix @@ -1,20 +1,32 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, nixosTests, systemd +{ stdenv +, lib +, buildGoModule +, fetchFromGitHub +, makeWrapper +, nixosTests +, systemd }: buildGoModule rec { - version = "2.1.0"; + version = "2.2.1"; pname = "grafana-loki"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "loki"; - sha256 = "O/3079a67j1i9pgf18SBx0iJcQPVmb0H+K/PzQVBCDQ="; + sha256 = "sha256-ujZD5GIgMewvEQW3Wnt0eHdMIFs77PkkEecgCDw9290="; }; vendorSha256 = null; - subPackages = [ "..." ]; + subPackages = [ + # TODO split every executable into its own package + "cmd/loki" + "cmd/loki-canary" + "cmd/promtail" + "cmd/logcli" + ]; nativeBuildInputs = [ makeWrapper ]; buildInputs = lib.optionals stdenv.isLinux [ systemd.dev ]; @@ -26,6 +38,11 @@ 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 + ''; + doCheck = true; meta = with lib; { |