Unverified Commit 101d8a8f authored by emilylange's avatar emilylange
Browse files

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
2598cb64 titled
`go, buildGoModule, buildGoPackage: default to 1.21` is already in
`staging-next` and will land in `master` soon.
parent effe9fcd

pkgs/servers/monitoring/grafana-agent/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 {

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -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 { };