From 56e814a7103e0d52fd53f168ebb477fbed28a2c6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 16 Apr 2026 20:56:17 +0100 Subject: [PATCH] grafana-alloy: set and enforce beylaVersion Since https://github.com/grafana/alloy/pull/5735, grafana-alloy sets the version of beyla in its ldflags. Add the missing logic for that, and a little assertion to prevent this from getting out of date. --- pkgs/by-name/gr/grafana-alloy/package.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 2522ace1ada9..dde2ea8226ba 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -13,6 +13,11 @@ lld, useLLD ? stdenv.hostPlatform.isArmv7, }: + +let + beylaVersion = "v3.6.0"; +in + buildGoModule (finalAttrs: { pname = "grafana-alloy"; version = "1.15.1"; @@ -49,6 +54,12 @@ buildGoModule (finalAttrs: { patchPhase = '' cp -av ${finalAttrs.frontend}/share internal/web/ui/dist + + goSumBeylaVersion="$(grep beyla go.sum | head -1 | cut -d ' ' -f2)" + if [[ "$goSumBeylaVersion" != "${beylaVersion}" ]];then + echo "beyla version in go.sum ($goSumBeylaVersion) doesn't match the one set in the expression (${beylaVersion}), needs updating." + exit 1 + fi ''; modRoot = "collector"; @@ -66,6 +77,7 @@ buildGoModule (finalAttrs: { "-X github.com/grafana/alloy/internal/build.Revision=v${finalAttrs.version}" "-X github.com/grafana/alloy/internal/build.BuildUser=nix@nixpkgs" "-X github.com/grafana/alloy/internal/build.BuildDate=1970-01-01T00:00:00Z" + "-X github.com/grafana/beyla/pkg/buildinfo=${beylaVersion}" ]; tags = [