lol

mimir: switch pname to mimir

+6 -5
+1 -1
nixos/modules/services/monitoring/mimir.nix
··· 53 53 else cfg.configFile; 54 54 in 55 55 { 56 - ExecStart = "${pkgs.grafana-mimir}/bin/mimir --config.file=${conf}"; 56 + ExecStart = "${pkgs.mimir}/bin/mimir --config.file=${conf}"; 57 57 DynamicUser = true; 58 58 Restart = "always"; 59 59 ProtectSystem = "full";
+1 -1
nixos/tests/all-tests.nix
··· 170 170 frr = handleTest ./frr.nix {}; 171 171 fsck = handleTest ./fsck.nix {}; 172 172 ft2-clone = handleTest ./ft2-clone.nix {}; 173 - grafana-mimir = handleTest ./grafana-mimir.nix {}; 173 + mimir = handleTest ./mimir.nix {}; 174 174 gerrit = handleTest ./gerrit.nix {}; 175 175 geth = handleTest ./geth.nix {}; 176 176 ghostunnel = handleTest ./ghostunnel.nix {};
+1 -1
nixos/tests/grafana-mimir.nix nixos/tests/mimir.nix
··· 1 1 import ./make-test-python.nix ({ pkgs, ... }: { 2 - name = "grafana-mimir"; 2 + name = "mimir"; 3 3 nodes = { 4 4 server = { ... }: { 5 5 environment.systemPackages = [ pkgs.jq ];
+1 -1
pkgs/servers/monitoring/mimir/default.nix
··· 18 18 ]; 19 19 20 20 passthru.tests = { 21 - inherit (nixosTests) grafana-mimir; 21 + inherit (nixosTests) mimir; 22 22 }; 23 23 24 24 ldflags = let t = "github.com/grafana/mimir/pkg/util/version";
+1
pkgs/top-level/aliases.nix
··· 538 538 graalvm8-ee = throw "graalvm8-ee has been removed because it is unmaintained"; # Added 2022-04-15 539 539 graalvm11-ee = throw "graalvm11-ee has been removed because it is unmaintained"; # Added 2022-04-15 540 540 gradio = throw "gradio has been removed because it is unmaintained, use shortwave instead"; # Added 2022-06-03 541 + grafana-mimir = throw "'grafana-mimir' has been renamed to/replaced by 'mimir'"; # Added 2022-06-07 541 542 gr-ais = gnuradio3_7.pkgs.ais; # Added 2019-05-27, changed 2020-10-16 542 543 grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 543 544 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16
+1 -1
pkgs/top-level/all-packages.nix
··· 21795 21795 21796 21796 grafana-loki = callPackage ../servers/monitoring/loki { }; 21797 21797 21798 - grafana-mimir = callPackage ../servers/monitoring/mimir { }; 21798 + mimir = callPackage ../servers/monitoring/mimir { }; 21799 21799 21800 21800 promtail = grafana-loki.overrideAttrs (o: { 21801 21801 pname = "promtail";