From 8af12f8ebd6f7cf9a6a00fd97aa6373c18895fbc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Dec 2021 15:44:17 +0100 Subject: 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] https://github.com/grafana/grafana/commit/d993b1241582b2ba93f323946a9e52e3a1e3ca9a#diff-0c326c4f02797b088fc566e64fbfe2162390f52f2fec1483ec3a413a7f11c910 --- pkgs/servers/monitoring/grafana/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkgs/servers/monitoring') diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 23a7ae85cfeb..32f31a686a6e 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -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; }; -- cgit 1.4.1