From 1146c444a9ce48358af9351ce925e5a33219a6b6 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 16 Feb 2025 19:24:58 -0500
Subject: [PATCH 1/3] grafana-loki, promtail: move to by-name

---
 .../gr/grafana-loki/package.nix}              | 55 ++++++++++++-------
 .../pr/promtail/package.nix}                  |  0
 pkgs/top-level/all-packages.nix               |  3 -
 3 files changed, 34 insertions(+), 24 deletions(-)
 rename pkgs/{servers/monitoring/loki/default.nix => by-name/gr/grafana-loki/package.nix} (64%)
 rename pkgs/{servers/monitoring/loki/promtail.nix => by-name/pr/promtail/package.nix} (100%)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/by-name/gr/grafana-loki/package.nix
similarity index 64%
rename from pkgs/servers/monitoring/loki/default.nix
rename to pkgs/by-name/gr/grafana-loki/package.nix
index d5434daeef38..a5f68648c243 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -1,12 +1,13 @@
-{ stdenv
-, lib
-, buildGoModule
-, fetchFromGitHub
-, makeWrapper
-, nixosTests
-, systemd
-, testers
-, grafana-loki
+{
+  stdenv,
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  makeWrapper,
+  nixosTests,
+  systemd,
+  testers,
+  grafana-loki,
 }:
 
 buildGoModule rec {
@@ -31,7 +32,7 @@ buildGoModule rec {
     "cmd/lokitool"
   ];
 
-  tags = ["promtail_journal_enabled"];
+  tags = [ "promtail_journal_enabled" ];
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ systemd.dev ];
@@ -49,22 +50,34 @@ buildGoModule rec {
     };
   };
 
-  ldflags = let t = "github.com/grafana/loki/v3/pkg/util/build"; in [
-    "-s"
-    "-w"
-    "-X ${t}.Version=${version}"
-    "-X ${t}.BuildUser=nix@nixpkgs"
-    "-X ${t}.BuildDate=unknown"
-    "-X ${t}.Branch=unknown"
-    "-X ${t}.Revision=unknown"
-  ];
+  ldflags =
+    let
+      t = "github.com/grafana/loki/v3/pkg/util/build";
+    in
+    [
+      "-s"
+      "-w"
+      "-X ${t}.Version=${version}"
+      "-X ${t}.BuildUser=nix@nixpkgs"
+      "-X ${t}.BuildDate=unknown"
+      "-X ${t}.Branch=unknown"
+      "-X ${t}.Revision=unknown"
+    ];
 
   meta = with lib; {
     description = "Like Prometheus, but for logs";
     mainProgram = "promtail";
-    license = with licenses; [ agpl3Only asl20 ];
+    license = with licenses; [
+      agpl3Only
+      asl20
+    ];
     homepage = "https://grafana.com/oss/loki/";
     changelog = "https://github.com/grafana/loki/releases/tag/v${version}";
-    maintainers = with maintainers; [ willibutz globin mmahut emilylange ];
+    maintainers = with maintainers; [
+      willibutz
+      globin
+      mmahut
+      emilylange
+    ];
   };
 }
diff --git a/pkgs/servers/monitoring/loki/promtail.nix b/pkgs/by-name/pr/promtail/package.nix
similarity index 100%
rename from pkgs/servers/monitoring/loki/promtail.nix
rename to pkgs/by-name/pr/promtail/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84e92b4eab81..f9d8d3139c04 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11261,9 +11261,6 @@ with pkgs;
   grafana = callPackage ../servers/monitoring/grafana { };
   grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
 
-  grafana-loki = callPackage ../servers/monitoring/loki { };
-  promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
-
   hasura-graphql-engine = haskell.lib.compose.justStaticExecutables haskell.packages.ghc810.graphql-engine;
 
   hasura-cli = callPackage ../servers/hasura/cli.nix { };

From be4ad2d6436c19f8af7ae8f4da1219644191062a Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 16 Feb 2025 19:26:14 -0500
Subject: [PATCH 2/3] grafana-loki: add updateScript

---
 pkgs/by-name/gr/grafana-loki/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index a5f68648c243..e2febf9a7713 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -4,6 +4,7 @@
   buildGoModule,
   fetchFromGitHub,
   makeWrapper,
+  nix-update-script,
   nixosTests,
   systemd,
   testers,
@@ -42,12 +43,16 @@ buildGoModule rec {
       --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib"
   '';
 
-  passthru.tests = {
-    inherit (nixosTests) loki;
-    version = testers.testVersion {
-      command = "loki --version";
-      package = grafana-loki;
+  passthru = {
+    tests = {
+      inherit (nixosTests) loki;
+      version = testers.testVersion {
+        command = "loki --version";
+        package = grafana-loki;
+      };
     };
+
+    updateScript = nix-update-script { };
   };
 
   ldflags =

From 80b1f28070af2c98eb624f031b7f57a0c8bd0dd9 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 17 Feb 2025 00:29:01 +0000
Subject: [PATCH 3/3] grafana-loki: 3.4.0 -> 3.4.2

---
 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 e2febf9a7713..8aeda3eb7495 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.4.0";
+  version = "3.4.2";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-fFdp2QZQgrLPcgzY833TfGvW7QPR/Omq0wwvcejMXac=";
+    hash = "sha256-GE92NlFCOk6qFtrgeBvLDI0OkmWaJ1j07Q14+jgi9+w=";
   };
 
   vendorHash = null;