summary refs log tree commit diff
diff options
context:
space:
mode:
authorFranz Pletz <fpletz@fnordicwalking.de>2023-06-23 23:15:43 +0200
committerGitHub <noreply@github.com>2023-06-23 23:15:43 +0200
commit48d0d69869415d0122fc80c994f57372cb980260 (patch)
tree23de0cd312ca2487cb0a2f7530eafa4c2c77adb0
parent4754facbd23967477f6daadb61853c5fbff15198 (diff)
parent6e6c2e653040634bb0c5624906ea4d8bc4cacf89 (diff)
downloadnixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar.gz
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar.bz2
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar.lz
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar.xz
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.tar.zst
nixpkgs-48d0d69869415d0122fc80c994f57372cb980260.zip
Merge pull request #239348 from Ma27/bump-grafana
-rw-r--r--nixos/modules/services/monitoring/grafana.nix2
-rw-r--r--pkgs/servers/monitoring/grafana/default.nix8
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index c54b65057ab..12f89196808 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -1773,7 +1773,7 @@ in
 
         # Warn about deprecated notifiers.
         deprecatedNotifiers = optional (cfg.provision.notifiers != [ ]) ''
-          Notifiers are deprecated upstream and will be removed in Grafana 10.
+          Notifiers are deprecated upstream and will be removed in Grafana 11.
           Use `services.grafana.provision.alerting.contactPoints` instead.
         '';
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 33590dd04f3..d745f1b2dbe 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
 
 buildGoModule rec {
   pname = "grafana";
-  version = "9.5.3";
+  version = "10.0.1";
 
   excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
 
@@ -10,15 +10,15 @@ buildGoModule rec {
     rev = "v${version}";
     owner = "grafana";
     repo = "grafana";
-    hash = "sha256-b9FkyDEidM7n+eY9IlZT9vysphe4CW5vGXYn9M5BIJM=";
+    hash = "sha256-7yxdUb0rP8yCyiy/IsMD3De66fwhY7KI8GNhwsbIB1o=";
   };
 
   srcStatic = fetchurl {
     url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
-    hash = "sha256-PfdRPMQrEaTwg9wWeyJo6I9HuQX6sxl1JbT9CTixnyc=";
+    hash = "sha256-dENdPLbXka1NKix9KqgZ/K5RAB4jVZsVeDpnoPllnEM=";
   };
 
-  vendorHash = "sha256-E9Qdsk691+laPrQQnYBIwxAIbXh7wxB0G2e/Vp+4x98=";
+  vendorHash = "sha256-ZDUEqueAr0z8+8+CxgfWhc4xgYU+X+aU9Kl48NcNIbM=";
 
   nativeBuildInputs = [ wire ];