From 101d8a8f8e34ba6af3808f82ae76f926d1573487 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 11 Oct 2023 17:58:28 +0200
Subject: [PATCH] grafana-agent: 0.36.2 -> 0.37.1

https://github.com/grafana/agent/releases/tag/v0.37.0
https://github.com/grafana/agent/blob/v0.37.0/CHANGELOG.md
diff: https://github.com/grafana/agent/compare/v0.36.2...v0.37.0

https://github.com/grafana/agent/releases/tag/v0.37.1
https://github.com/grafana/agent/blob/v0.37.1/CHANGELOG.md
diff: https://github.com/grafana/agent/compare/v0.37.0...v0.37.1

grafana-agent, starting with 0.37.0, requires go >= 1.21.
In nixpkgs (unstable), `buildGoModule` still refers to
`buildGo120Module`. Which, as the name suggests, uses go 1.20, and thus
does not meet the requirement, so we have to manually override it in
`all-packages.nix`.

This override can be dropped very soon again, as commit
2598cb64c13cccc1b380beeaf6b8bba0a472327a titled
`go, buildGoModule, buildGoPackage: default to 1.21` is already in
`staging-next` and will land in `master` soon.
---
 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 cc2ccc3b0190..458c84a7bd4a 100644
--- a/pkgs/servers/monitoring/grafana-agent/default.nix
+++ b/pkgs/servers/monitoring/grafana-agent/default.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "grafana-agent";
-  version = "0.36.2";
+  version = "0.37.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "agent";
     rev = "v${version}";
-    hash = "sha256-c8eay3lwAVqodw6MPU02tSQ+8D0+qywCI+U6bfJVk5A=";
+    hash = "sha256-0agQAz/oR6hrokAAjCLMcDrR6/f4r0BJgQHWZvGqWAE=";
   };
 
-  vendorHash = "sha256-kz/yogvKqUGP+TQjrzophA4qQ+Qf32cV/CuyNuM9fzM=";
+  vendorHash = "sha256-GfIzZ0fuRrlYLbGbYVE1HzMZfszokfixG+YVqkTyaQE=";
   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 d86b30b3a4de..edd0edeba750 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -26654,7 +26654,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 = buildGo121Module;
+  };
 
   grafana-loki = callPackage ../servers/monitoring/loki { };
   promtail = callPackage ../servers/monitoring/loki/promtail.nix { };