Skip to content

Commit

Permalink
grafana: 10.4.9 -> 10.4.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Ma27 committed Oct 8, 2024
1 parent df27247 commit d58146c
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions pkgs/servers/monitoring/grafana/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,25 @@ let
done
rm -r packages/grafana-e2e
'';

# Grafana seems to just set it to the latest version available
# nowadays.
patchGoVersion = ''
substituteInPlace go.{mod,work} pkg/build/go.mod \
--replace-fail "go 1.22.7" "go 1.22.6"
'';
in
buildGoModule rec {
pname = "grafana";
version = "10.4.9";
version = "10.4.10";

subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];

src = fetchFromGitHub {
owner = "grafana";
repo = "grafana";
rev = "v${version}";
hash = "sha256-Rapbfh2sHHi6wDXpihY1gGx2fA6IM/04THsE1dw1rOo=";
hash = "sha256-qbKrSMhV2Zdqt3N8bUOn7sUuz9lHl2BbMy/Y6ymK/NY=";
};

# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
Expand All @@ -49,6 +56,7 @@ buildGoModule rec {
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
postPatch = ''
${patchAwayGrafanaE2E}
${patchGoVersion}
'';
buildPhase = ''
runHook preBuild
Expand Down Expand Up @@ -82,6 +90,7 @@ buildGoModule rec {

postPatch = ''
${patchAwayGrafanaE2E}
${patchGoVersion}
'';

postConfigure = ''
Expand Down

0 comments on commit d58146c

Please sign in to comment.