cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #176635 from happysalada/fix_mimir_module

Browse source 
grafana-mimir: fix package name in module
This commit is contained in:
Jörg Thalheim 2022-06-07 13:34:23 +01:00 committed by GitHub
commit 71153a85f7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/services/monitoring/mimir.nix
View file

@ -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";

2
nixos/tests/all-tests.nix
View file

@ -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 {};

2
nixos/tests/grafana-mimir.nix → nixos/tests/mimir.nix
View file

@ -1,5 +1,5 @@
import ./make-test-python.nix ({ pkgs, ... }: {
name = "grafana-mimir";
name = "mimir";
nodes = {
server = { ... }: {
environment.systemPackages = [ pkgs.jq ];

2
pkgs/servers/monitoring/mimir/default.nix
View file

@ -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";

1
pkgs/top-level/aliases.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -21792,7 +21792,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";