From c3964a5c4081628527ddecebb4eece3deb4d4868 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 26 Nov 2025 17:37:48 +0000
Subject: [PATCH 1/2] grafana-loki,promtail: 3.5.8 -> 3.6.2

https://github.com/grafana/loki/releases/tag/v3.6.2

https://github.com/grafana/loki/releases/tag/v3.6.1

https://github.com/grafana/loki/releases/tag/v3.6.0
---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index c7bfe7fbae66..e9fad41f0b2f 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.5.8";
+  version = "3.6.2";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY=";
+    hash = "sha256-7Z1TzAtKBrivnpkgipWK33Yyc6yguoNuinqSvG5gvXM=";
   };
 
   vendorHash = null;

From b8e7b088a2fe9d301242fa70db5e315bef43c167 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 2 Dec 2025 17:19:45 +0100
Subject: [PATCH 2/2] nixos/tests/loki: remove no longer needed example config
 patching

Upstream moved enable_multi_variant_queries to the correct config
section in v3.6.0.
---
 nixos/tests/loki.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/nixos/tests/loki.nix b/nixos/tests/loki.nix
index 1c67b0e7f7f2..3b2e29e3443c 100644
--- a/nixos/tests/loki.nix
+++ b/nixos/tests/loki.nix
@@ -10,15 +10,7 @@
     {
       services.loki = {
         enable = true;
-
-        # FIXME: revert to original file when upstream fix released
-        #  https://github.com/grafana/loki/issues/16990
-        #  https://github.com/grafana/loki/issues/17736
-        # configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
-        configFile = pkgs.runCommand "patched-loki-cfg.yml" { } ''
-          substitute "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml" "$out" \
-            --replace-fail "enable_multi_variant_queries: true" ""
-        '';
+        configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
       };
       services.promtail = {
         enable = true;