From 5c4bfdd5d8d0b9046cfdae22b79afca3b63f43eb Mon Sep 17 00:00:00 2001 From: emilylange Date: Fri, 15 Mar 2024 03:18:37 +0100 Subject: [PATCH] grafana-agent: 0.40.2 -> 0.40.3 Beginning with 0.40.3, grafana-agent now requires at least go 1.22 to build. https://github.com/grafana/agent/releases/tag/v0.40.3 https://github.com/grafana/agent/blob/v0.40.3/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.40.2...v0.40.3 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 622147f92f97..0597eaa75351 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,16 +15,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.2"; + version = "0.40.3"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-muSgFBg+/XWx2f9EGYYLQ0wUzZ7AxEC2F19A5Qs5cgw="; + hash = "sha256-oezfeUW+CVwqe8T3pEkLU1vxI1dntMQ6cvE9AqxKtR8="; }; - vendorHash = "sha256-ekFl+aSmyUvgv4pkpS86HwPMfqtDaJEaZhWiwHjHp9g="; + vendorHash = "sha256-64etBHKlEPByDzrEP3YYhgR4vnj4yvHk6cjB92myqyc="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8de3b01656c..35cc8e0ba5f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26101,7 +26101,9 @@ with pkgs; grafana = callPackage ../servers/monitoring/grafana { }; grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { }; - grafana-agent = callPackage ../servers/monitoring/grafana-agent { }; + grafana-agent = callPackage ../servers/monitoring/grafana-agent { + buildGoModule = buildGo122Module; + }; grafana-loki = callPackage ../servers/monitoring/loki { }; promtail = callPackage ../servers/monitoring/loki/promtail.nix { };