From 333122915b411280b1dda3eb655946ba596ccbf9 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Mar 2025 12:35:02 +0100
Subject: [PATCH 1/2] grafana-alloy: fix updateScript selecting the wrong tag

https://github.com/grafana/alloy has tags not just for the binary
releases of grafana-alloy itself, but also for their helm-chart and
their oci build-image.

By adding --version-regex to nix-update, we filter out those unwanted
tags that would otherwise make the update script fail.
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index 37334cc5c58d..e4ace211d204 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -127,7 +127,12 @@ buildGoModule rec {
         package = grafana-alloy;
       };
     };
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "v(.+)"
+      ];
+    };
     # alias for nix-update to be able to find and update this attribute
     offlineCache = yarnOfflineCache;
   };

From 4422dc0c6270bdc569f1aa3aef750edc3ab11c4c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Mar 2025 12:41:49 +0100
Subject: [PATCH 2/2] grafana-alloy: 1.6.1 -> 1.7.1

https://github.com/grafana/alloy/releases/tag/v1.7.0
https://github.com/grafana/alloy/releases/tag/v1.7.1

diff: https://github.com/grafana/alloy/compare/v1.6.1...v1.7.1
---
 pkgs/by-name/gr/grafana-alloy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index e4ace211d204..92286c91e699 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,17 +17,17 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-7NcSe+6MqS5Bxu64qaJKKxSsQYYEqeGGRgDpcag8t1I=";
+    hash = "sha256-t1YDYQ+0RKHYaL/oE9XGjV7/g28rHO9avL6/CTfMHeE=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-DmSyEgEIJEMOOfOQxDZUGT81Iw6QO0gOhSkXSilL16g=";
+  vendorHash = "sha256-d9uWbZ+5YSnB3yqL/YZ0ld+8soO3oGb8gttzj3Q7MXs=";
 
   nativeBuildInputs = [
     fixup-yarn-lock