From ec38c9c76bbeda6fd6cf718f310fb12869c78108 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Mon, 1 May 2023 19:58:55 +0200 Subject: [PATCH 1/2] grafana-agent: 0.33.0 -> 0.33.1 https://github.com/grafana/agent/releases/tag/v0.33.1 https://github.com/grafana/agent/blob/v0.33.1/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.33.0...v0.33.1 --- pkgs/servers/monitoring/grafana-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 19cd13ce7e8f..83c9ed47eb91 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "grafana"; repo = "agent"; - sha256 = "sha256-Goj/IySGDMa8pNwU/4oXIlGqMysghNj0EjnQZtN6v1E="; + sha256 = "sha256-iE7LNm0Nur0eo7AjTDl9sq3oxm6SdIUoSfT8h2C4jOA="; }; vendorHash = "sha256-NqsUeTxTYQrVMJ4LYA5NC8A/PpVuy6fnKptxK+ieZAU="; From cbcafdc13b3ae14847b305b8af64f25b65f9ca19 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Mon, 1 May 2023 20:10:49 +0200 Subject: [PATCH 2/2] grafana-agent: add version test --- .../monitoring/grafana-agent/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 83c9ed47eb91..b5ba65fb396e 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -1,4 +1,12 @@ -{ lib, stdenv, buildGoModule, fetchFromGitHub, systemd, nixosTests }: +{ lib +, buildGoModule +, fetchFromGitHub +, grafana-agent +, nixosTests +, stdenv +, systemd +, testers +}: buildGoModule rec { pname = "grafana-agent"; @@ -50,7 +58,14 @@ buildGoModule rec { $out/bin/grafana-agent ''; - passthru.tests.grafana-agent = nixosTests.grafana-agent; + passthru.tests = { + inherit (nixosTests) grafana-agent; + version = testers.testVersion { + inherit version; + command = "${lib.getExe grafana-agent} --version"; + package = grafana-agent; + }; + }; meta = with lib; { description = "A lightweight subset of Prometheus and more, optimized for Grafana Cloud";