From 20d9f44b8fcc91d21701eb5490fe7d9aaf8316bb Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 21 Jun 2023 18:53:44 +0200 Subject: [PATCH 1/2] grafana-agent: add `meta.changelog` --- pkgs/servers/monitoring/grafana-agent/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index c095c86108d7..f8d12bde1073 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -67,10 +67,11 @@ buildGoModule rec { }; }; - meta = with lib; { + meta = { description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud"; - license = licenses.asl20; + license = lib.licenses.asl20; homepage = "https://grafana.com/products/cloud"; - maintainers = with maintainers; [ flokli emilylange ]; + changelog = "https://github.com/grafana/agent/blob/${src.rev}/CHANGELOG.md"; + maintainers = with lib.maintainers; [ flokli emilylange ]; }; } From fd6ec9631196b05fe6045e402d0c630907514155 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 21 Jun 2023 18:53:47 +0200 Subject: [PATCH 2/2] grafana-agent: 0.34.1 -> 0.34.2 https://github.com/grafana/agent/releases/tag/v0.34.2 https://github.com/grafana/agent/blob/v0.34.2/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.34.1...v0.34.2 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index f8d12bde1073..8a6434ac9a61 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.34.1"; + version = "0.34.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - hash = "sha256-xgmh5oFI6Pd0q31zJluLtbhF0ZfuXy2cEPk06sW9SH8="; + hash = "sha256-PGxqIeOqc2U4i6l3ENnpb1BAoWrEAh2p3X+azzbpl3k="; }; - vendorHash = "sha256-LKHs6KHdXtCMImYiUmi2pfMbfpt9alpvWS4rlo5kuCI="; + vendorHash = "sha256-x9c6xRk1Ska+kqoFhAJ9ei35Lg8wsgDpZpfxJ3UExfg="; proxyVendor = true; # darwin/linux hash mismatch ldflags = let