Unverified Commit 6d0e5aea authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

grafana-loki: 3.4.0 -> 3.4.2 (#382699)

parents 31b8b248 80b1f280

pkgs/servers/monitoring/loki/default.nix→pkgs/by-name/gr/grafana-loki/package.nix

+88 −0
Original line number Diff line number Diff line 
{ stdenv

, lib

, buildGoModule

, fetchFromGitHub

, makeWrapper

, nixosTests

, systemd

, testers

, grafana-loki

{

  stdenv,

  lib,

  buildGoModule,

  fetchFromGitHub,

  makeWrapper,

  nix-update-script,

  nixosTests,

  systemd,

  testers,

  grafana-loki,

}:



buildGoModule rec {

  version = "3.4.0";

  version = "3.4.2";

  pname = "grafana-loki";



  src = fetchFromGitHub {

    owner = "grafana";

    repo = "loki";

    rev = "v${version}";

    hash = "sha256-fFdp2QZQgrLPcgzY833TfGvW7QPR/Omq0wwvcejMXac=";

    hash = "sha256-GE92NlFCOk6qFtrgeBvLDI0OkmWaJ1j07Q14+jgi9+w=";

  };



  vendorHash = null;
@@ -41,7 +43,8 @@ buildGoModule rec { 
      --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"

  '';



  passthru.tests = {

  passthru = {

    tests = {

      inherit (nixosTests) loki;

      version = testers.testVersion {

        command = "loki --version";
@@ -49,7 +52,14 @@ buildGoModule rec { 
      };

    };



  ldflags = let t = "github.com/grafana/loki/v3/pkg/util/build"; in [

    updateScript = nix-update-script { };

  };



  ldflags =

    let

      t = "github.com/grafana/loki/v3/pkg/util/build";

    in

    [

      "-s"

      "-w"

      "-X ${t}.Version=${version}"
@@ -62,9 +72,17 @@ buildGoModule rec { 
  meta = with lib; {

    description = "Like Prometheus, but for logs";

    mainProgram = "promtail";

    license = with licenses; [ agpl3Only asl20 ];

    license = with licenses; [

      agpl3Only

      asl20

    ];

    homepage = "https://grafana.com/oss/loki/";

    changelog = "https://github.com/grafana/loki/releases/tag/v${version}";

    maintainers = with maintainers; [ willibutz globin mmahut emilylange ];

    maintainers = with maintainers; [

      willibutz

      globin

      mmahut

      emilylange

    ];

  };

}

pkgs/top-level/all-packages.nix

+0 −3
Original line number Diff line number Diff line
@@ -11263,9 +11263,6 @@ with pkgs; 
  grafana = callPackage ../servers/monitoring/grafana { };

  grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };













  grafana-loki = callPackage ../servers/monitoring/loki { };













  promtail = callPackage ../servers/monitoring/loki/promtail.nix { };



























  hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;





























  hasura-cli = callPackage ../servers/hasura/cli.nix { };