From f5ef819e24c45331636ad28861bce952f25b2fae Mon Sep 17 00:00:00 2001
From: happysalada <raphael@megzari.com>
Date: Tue, 7 Jun 2022 06:53:15 -0400
Subject: [PATCH] mimir: switch pname to mimir

---
 nixos/modules/services/monitoring/mimir.nix  | 2 +-
 nixos/tests/all-tests.nix                    | 2 +-
 nixos/tests/{grafana-mimir.nix => mimir.nix} | 2 +-
 pkgs/servers/monitoring/mimir/default.nix    | 2 +-
 pkgs/top-level/aliases.nix                   | 1 +
 pkgs/top-level/all-packages.nix              | 2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)
 rename nixos/tests/{grafana-mimir.nix => mimir.nix} (98%)

diff --git a/nixos/modules/services/monitoring/mimir.nix b/nixos/modules/services/monitoring/mimir.nix
index f85f3ab02c37..83c0b23c59dd 100644
--- a/nixos/modules/services/monitoring/mimir.nix
+++ b/nixos/modules/services/monitoring/mimir.nix
@@ -53,7 +53,7 @@ in {
                else cfg.configFile;
       in
       {
-        ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}";
+        ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}";
         DynamicUser = true;
         Restart = "always";
         ProtectSystem = "full";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0f75548ff6fd..1064d62da930 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -170,7 +170,7 @@ in {
   frr = handleTest ./frr.nix {};
   fsck = handleTest ./fsck.nix {};
   ft2-clone = handleTest ./ft2-clone.nix {};
-  grafana-mimir = handleTest ./grafana-mimir.nix {};
+  mimir = handleTest ./mimir.nix {};
   gerrit = handleTest ./gerrit.nix {};
   geth = handleTest ./geth.nix {};
   ghostunnel = handleTest ./ghostunnel.nix {};
diff --git a/nixos/tests/grafana-mimir.nix b/nixos/tests/mimir.nix
similarity index 98%
rename from nixos/tests/grafana-mimir.nix
rename to nixos/tests/mimir.nix
index 0aafa956f0be..f1b30d261472 100644
--- a/nixos/tests/grafana-mimir.nix
+++ b/nixos/tests/mimir.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
-  name = "grafana-mimir";
+  name = "mimir";
   nodes = {
     server = { ... }: {
       environment.systemPackages = [ pkgs.jq ];
diff --git a/pkgs/servers/monitoring/mimir/default.nix b/pkgs/servers/monitoring/mimir/default.nix
index 500ba3154753..9a837073eeed 100644
--- a/pkgs/servers/monitoring/mimir/default.nix
+++ b/pkgs/servers/monitoring/mimir/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
   ];
 
   passthru.tests = {
-    inherit (nixosTests) grafana-mimir;
+    inherit (nixosTests) mimir;
   };
 
   ldflags = let t = "github.com/grafana/mimir/pkg/util/version";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 708d76f3da34..39e4a1ba9f39 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -538,6 +538,7 @@ mapAliases ({
   graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15
   graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15
   gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03
+  grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07
   gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16
   grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22
   gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6b1c16e735d8..ea41516e7b25 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -21795,7 +21795,7 @@ with pkgs;
 
   grafana-loki = callPackage ../servers/monitoring/loki { };
 
-  grafana-mimir = callPackage ../servers/monitoring/mimir { };
+  mimir = callPackage ../servers/monitoring/mimir { };
 
   promtail = grafana-loki.overrideAttrs (o: {
     pname = "promtail";