From d5fd4f001b4aaae09c98fd260ae0256e6aa09b1a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 22 Oct 2025 11:14:52 +0200 Subject: [PATCH 1/2] grafana: fix `find(1)` brackets in `go.mod` fixup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DAMN you `find`! The parentheses are only necessary when having `-exec` 🫠 It does what I expected, i.e. finding EVERY go.mod and go.work instead of only go.work when not using `-exec`. --- pkgs/servers/monitoring/grafana/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 524ba2fa4c0e..6d5d8a69bd5a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -64,7 +64,7 @@ buildGoModule (finalAttrs: { # This is still better than maintaining some list of go.mod files (or exclusions of that) # where to patch the go version (and where to not do that). postPatch = '' - find . -name go.mod -or -name "go.work" -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \; + find . \( -name go.mod -or -name "go.work" \) -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \; ''; proxyVendor = true; From 3d7406bd588638a9c4d9db4ee3dc87ea0ee5180d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 22 Oct 2025 11:15:55 +0200 Subject: [PATCH 2/2] grafana: 12.2.0 -> 12.2.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.2.1 --- pkgs/servers/monitoring/grafana/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 6d5d8a69bd5a..eac1cb5e7ec6 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { pname = "grafana"; - version = "12.2.0"; + version = "12.2.1"; subPackages = [ "pkg/cmd/grafana" @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { owner = "grafana"; repo = "grafana"; rev = "v${finalAttrs.version}"; - hash = "sha256-EFqR+du+ZeWih7+s4iVVAiwOvTwbF1pNg1TntkoGCEQ="; + hash = "sha256-fOlf+NTV1DIotC0JyG+PCMe8uPr+mfe/CLQP7dmRtkg="; }; # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 @@ -46,12 +46,12 @@ buildGoModule (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes; - hash = "sha256-BqlkFgWiU5gruDHjkazNy6GKL2KgpcrwaHXDYNBF9EY="; + hash = "sha256-aXWi2hriPHm1Gsmd6Zg8eTR//KuI6SrvJAYhTeRZTug="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; - vendorHash = "sha256-yoOs9MngUCfvvK9rPUsXCoSc5LiRs0g66KdINLQzO8Q="; + vendorHash = "sha256-TvKG/fUBure2wiZDVFD7dHGVDBl8gqWRkv2YBYNcIDQ="; # Grafana seems to just set it to the latest version available # nowadays.