Unverified Commit 6c5e8bcc authored by ajs124's avatar ajs124 Committed by GitHub
Browse files

Merge pull request #223757 from IndeedNotJames/loki 

grafana-loki,promtail: 2.7.4 -> 2.8.0, remove buildGoModule pin, add myself as maintainer
parents 0662bd2b cf0f78a2

pkgs/servers/monitoring/loki/default.nix

+5 −8
Original line number Diff line number Diff line
@@ -8,17 +8,17 @@ 
}:



buildGoModule rec {

  version = "2.7.4";

  version = "2.8.0";

  pname = "grafana-loki";



  src = fetchFromGitHub {

    rev = "v${version}";

    owner = "grafana";

    repo = "loki";

    sha256 = "sha256-afa4uInoNyEgNDJ7nB1yr+YYoOsU+S7XWhKvkeApgRQ=";

    rev = "v${version}";

    hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";

  };



  vendorSha256 = null;

  vendorHash = null;



  subPackages = [

    # TODO split every executable into its own package
@@ -48,13 +48,10 @@ buildGoModule rec { 
    "-X ${t}.Revision=unknown"

  ];



  doCheck = true;



  meta = with lib; {

    description = "Like Prometheus, but for logs";

    license = with licenses; [ agpl3Only asl20 ];

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

    maintainers = with maintainers; [ willibutz globin mmahut ];

    platforms = platforms.unix;

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

  };

}

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -25006,9 +25006,7 @@ with pkgs; 
    buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure

  };













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













    buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure













  };













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















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





























  mimir = callPackage ../servers/monitoring/mimir { };