From b9a900d2944ba76f8eac82504dd85b10ba4832cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 29 Aug 2025 12:53:25 +0200 Subject: [PATCH] grafana: 12.0.3 -> 12.0.4 ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.0.4 --- pkgs/servers/monitoring/grafana/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b4ccf77cc9e9..0c8c59c851ae 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -26,21 +26,25 @@ let # stable is on an older patch-release of Go and then the build would fail # after a backport. patchGoVersion = '' - find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -print0 | while IFS= read -r -d ''' line; do + find . -name go.mod -not -path "./.bingo/*" -and -not -path "./devenv/*" -and -not -path "./hack/*" -and -not -path "./scripts/*" -and -not -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do + substituteInPlace "$line" \ + --replace-fail "go 1.24.6" "go 1.24.0" + done + find . -name go.mod -path "./.citools/*" -print0 | while IFS= read -r -d ''' line; do substituteInPlace "$line" \ --replace-fail "go 1.24.5" "go 1.24.0" done find . -name go.work -print0 | while IFS= read -r -d ''' line; do substituteInPlace "$line" \ - --replace-fail "go 1.24.5" "go 1.24.0" + --replace-fail "go 1.24.6" "go 1.24.0" done substituteInPlace Makefile \ - --replace-fail "GO_VERSION = 1.24.5" "GO_VERSION = 1.24.0" + --replace-fail "GO_VERSION = 1.24.6" "GO_VERSION = 1.24.0" ''; in buildGoModule rec { pname = "grafana"; - version = "12.0.3"; + version = "12.0.4"; subPackages = [ "pkg/cmd/grafana" @@ -52,7 +56,7 @@ buildGoModule rec { owner = "grafana"; repo = "grafana"; rev = "v${version}"; - hash = "sha256-OSuezc8hehMyJuo3ldvsDf8tD+KvpUz5+MyzaLnUCGA="; + hash = "sha256-htuBN+LyP3RgVG53LN0cgGn7Dmesgv/U1A9jYj4cdGc="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -66,7 +70,7 @@ buildGoModule rec { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit src missingHashes; - hash = "sha256-ekqvMDEOwEqwrNnkpDqwJilXHr90XvmnbB+8wS3dbvY="; + hash = "sha256-OqdW5DRUDgWwbuHMNLTkM4gtjTK9vvm4g7L6tcEQFMs="; }; disallowedRequisites = [ offlineCache ];