grafana: 8.3.2 -> 8.3.3

ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.3.3

Note: I had to copy `defaults.ini` from the Git repo rather than from
`srcStatic`. This is because the `srcStatic`-variant missed some config
changes[1] which caused the test to fail like this:

    postgresql # [   24.754735] grafana-start[900]: Failed to start grafana. error: section "tracing.opentelemetry.jaeger" does not exist
    postgresql # [   24.756013] grafana-start[900]: section "tracing.opentelemetry.jaeger" does not exist
    postgresql # [   24.762057] systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE
    postgresql # [   24.765443] systemd[1]: grafana.service: Failed with result 'exit-code'.
    postgresql # [   24.767419] systemd[1]: grafana.service: Consumed 1.598s CPU time, no IP traffic.

[1] d993b12415 (diff-0c326c4f02797b088fc566e64fbfe2162390f52f2fec1483ec3a413a7f11c910)
This commit is contained in:
Maximilian Bosch 2021-12-19 15:44:17 +01:00
parent f69b20f6a9
commit 8af12f8ebd
No known key found for this signature in database
GPG Key ID: 091DBF4D1FC46B8E

View File

@ -2,7 +2,7 @@
buildGo117Module rec {
pname = "grafana";
version = "8.3.2";
version = "8.3.3";
excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)";
@ -10,15 +10,15 @@ buildGo117Module rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-oPCeK9SHRpShAjLK3l8yMIwcrGvoUNjaeNNWZBjCIas=";
sha256 = "sha256-kfeYAEwHal5bfCmNe2l5iBLM4D3eYFaVtVhXdN90o+I=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-EA+SxQqmEvITBSxVWU5Ytot9pkG3UcXxRAA9cEcw0Yk=";
sha256 = "sha256-iUKMUg4AS8ufr3YY3UyB/2JJYGTL8urT4bnbz0dsbxg=";
};
vendorSha256 = "sha256-aS9yz0JODZtichaIkiBJLiMjbjGY93eSYwuactbRqOY=";
vendorSha256 = "sha256-FHVlCL4ZyHO7Ebi31K1wXcMiN6hiQjVz+5jkJx8R7jc=";
nativeBuildInputs = [ wire ];
@ -62,6 +62,8 @@ buildGo117Module rec {
tar -xvf $srcStatic
mkdir -p $out/share/grafana
mv grafana-*/{public,conf,tools} $out/share/grafana/
cp ./conf/defaults.ini $out/share/grafana/conf/
'';
passthru.tests = { inherit (nixosTests) grafana; };