Merge pull request #223757 from IndeedNotJames/loki

grafana-loki,promtail: 2.7.4 -> 2.8.0, remove buildGoModule pin, add myself as maintainer

ajs124 6c5e8bcc 0662bd2b

Changed files
+6 -11
pkgs
servers
monitoring
top-level
+5 -8
pkgs/servers/monitoring/loki/default.nix
···
}:
buildGoModule rec {
-
version = "2.7.4";
pname = "grafana-loki";
src = fetchFromGitHub {
-
rev = "v${version}";
owner = "grafana";
repo = "loki";
-
sha256 = "sha256-afa4uInoNyEgNDJ7nB1yr+YYoOsU+S7XWhKvkeApgRQ=";
};
-
vendorSha256 = null;
subPackages = [
# TODO split every executable into its own package
···
"-X ${t}.Revision=unknown"
];
-
doCheck = true;
-
meta = with lib; {
description = "Like Prometheus, but for logs";
license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/";
-
maintainers = with maintainers; [ willibutz globin mmahut ];
-
platforms = platforms.unix;
};
}
···
}:
buildGoModule rec {
+
version = "2.8.0";
pname = "grafana-loki";
src = fetchFromGitHub {
owner = "grafana";
repo = "loki";
+
rev = "v${version}";
+
hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";
};
+
vendorHash = null;
subPackages = [
# TODO split every executable into its own package
···
"-X ${t}.Revision=unknown"
];
meta = with lib; {
description = "Like Prometheus, but for logs";
license = with licenses; [ agpl3Only asl20 ];
homepage = "https://grafana.com/oss/loki/";
+
maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ];
};
}
+1 -3
pkgs/top-level/all-packages.nix
···
buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure
};
-
grafana-loki = callPackage ../servers/monitoring/loki {
-
buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure
-
};
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
mimir = callPackage ../servers/monitoring/mimir { };
···
buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure
};
+
grafana-loki = callPackage ../servers/monitoring/loki { };
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
mimir = callPackage ../servers/monitoring/mimir { };