colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #223757 from IndeedNotJames/loki

Browse Source 
grafana-loki,promtail: 2.7.4 -> 2.8.0, remove buildGoModule pin, add myself as maintainer
This commit is contained in:
ajs124 2023-04-11 19:57:51 +02:00 committed by GitHub
commit 6c5e8bcc15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/monitoring/loki/default.nix
View File

@ -8,17 +8,17 @@
}:
buildGoModule rec {
version = "2.7.4";
version = "2.8.0";
pname = "grafana-loki";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "loki";
sha256 = "sha256-afa4uInoNyEgNDJ7nB1yr+YYoOsU+S7XWhKvkeApgRQ=";
rev = "v${version}";
hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";
};
vendorSha256 = null;
vendorHash = null;
subPackages = [
# TODO split every executable into its own package
@ -48,13 +48,10 @@ buildGoModule rec {
"-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;
maintainers = with maintainers; [ willibutz globin mmahut indeednotjames ];
};
}

4
pkgs/top-level/all-packages.nix
View File

@ -25006,9 +25006,7 @@ with pkgs;
buildGoModule = buildGo119Module; # nixosTests.grafana-agent go 1.20 failure
};
grafana-loki = callPackage ../servers/monitoring/loki {
buildGoModule = buildGo119Module; # nixosTests.loki go 1.20 failure
};
grafana-loki = callPackage ../servers/monitoring/loki { };
promtail = callPackage ../servers/monitoring/loki/promtail.nix { };
mimir = callPackage ../servers/monitoring/mimir { };