diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-12-21 01:15:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-21 01:15:50 +0100 |
| commit | d03f43901309f4bc3565228a6b714c3c764223bb (patch) | |
| tree | 14dc2c9bc0ebb29f2b932cad9798ed0cdc8cb903 /pkgs/servers/monitoring | |
| parent | d86f0be1816b06690e36e67b42df3cae93b10ae4 (diff) | |
| parent | 8af12f8ebd6f7cf9a6a00fd97aa6373c18895fbc (diff) | |
| download | nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar.gz nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar.bz2 nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar.lz nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar.xz nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.tar.zst nixlib-d03f43901309f4bc3565228a6b714c3c764223bb.zip | |
Merge pull request #151314 from Ma27/bump-grafana
grafana: 8.3.2 -> 8.3.3
Diffstat (limited to 'pkgs/servers/monitoring')
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 10 |
1 files changed, 6 insertions, 4 deletions
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; }; |