From 86096c22912605eea82a54cd8683538c9bb5c7ba Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 11 Mar 2026 11:12:44 +0100 Subject: [PATCH 1/2] grafanaPlugins.grafana-clickhouse-datasource: 4.8.2 -> 4.14.0 --- .../plugins/grafana-clickhouse-datasource/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix index 594465af314a..9666486063f4 100644 --- a/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix +++ b/pkgs/servers/monitoring/grafana/plugins/grafana-clickhouse-datasource/default.nix @@ -2,12 +2,12 @@ grafanaPlugin rec { pname = "grafana-clickhouse-datasource"; - version = "4.8.2"; + version = "4.14.0"; zipHash = { - x86_64-linux = "sha256-gegkpks7KIHKUG3nmNzEulbhH18eOsx8Afr0tprHFkk="; - aarch64-linux = "sha256-wvde2c+goezC1xFPZZ9MnHEk287E2ScyExKNXDTbcT8="; - x86_64-darwin = "sha256-zS9LfvSOWCKQIv5GsRS48taM31ZN4i2REY+IIQbqisk="; - aarch64-darwin = "sha256-0QfTdgOkfs27EW1VB+AgHPwF1GRcFBxMPBZ9nRyovrs="; + x86_64-linux = "sha256-+4RoyDRGLgD46FelK9zWfjokiXtgBhEU5RdsGheCEns="; + aarch64-linux = "sha256-9CJy8Wf/B17T64NyL4SBrmLYecdVYSXA5qnpKhcdAHs="; + x86_64-darwin = "sha256-ixrSa02vC/MBg29FNmBRd6YvhkL3QZnzOysLLFgjHEA="; + aarch64-darwin = "sha256-g7ovNQ5jJWcG82EJr6mnc2ijD/Wk6dY3cYhSchZOs5M="; }; meta = { description = "Connects Grafana to ClickHouse"; From 4fdedf5f0810efc4dd28f4586c2f7e972e60acc5 Mon Sep 17 00:00:00 2001 From: Bouke van der Bijl Date: Wed, 11 Mar 2026 11:13:11 +0100 Subject: [PATCH 2/2] grafanaPlugins: prefer per-platform hashes to 'any' Some packages have both per-platform _and_ an 'any' packages (e.g. grafana-clickhouse-datasource) and the update script fails for those cases. Prefer the per-platform packages if available. --- .../monitoring/grafana/plugins/update-grafana-plugin.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh index db1463c7333c..34638be8d264 100755 --- a/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh +++ b/pkgs/servers/monitoring/grafana/plugins/update-grafana-plugin.sh @@ -35,8 +35,8 @@ update() { update-source-version $system "grafanaPlugins.${plugin_name}" "$latest_version" "$hash" } -if echo "$api_response" | jq -e .packages.any > /dev/null; then - # the package contains an "any" package, so there should be only one zipHash. +if echo "$api_response" | jq -e '.packages | select(length == 1) | .any' > /dev/null; then + # the package only contains an "any" package, so there should be only one zipHash. update "any" else update "linux-amd64" "x86_64-linux"