nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-23 04:25:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

grafana: 11.1.0 -> 11.1.3

Browse Source 
ChangeLog:
* https://github.com/grafana/grafana/releases/tag/v11.1.3
* https://github.com/grafana/grafana/releases/tag/v11.1.2
* https://github.com/grafana/grafana/releases/tag/v11.1.1
This commit is contained in:
Maximilian Bosch 2024-07-26 20:56:33 +02:00
parent bb7d08ac86
commit 05ffd360b5
No known key found for this signature in database
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/servers/monitoring/grafana/default.nix
View File

@ -6,19 +6,9 @@
, faketty , faketty
}: }:
let
# Grafana seems to just set it to the latest version available
# nowadays.
patchGoVersion = ''
substituteInPlace go.{mod,work} pkg/build/wire/go.mod \
--replace-fail "go 1.22.4" "go 1.22.3"
substituteInPlace Makefile \
--replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3"
'';
in
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "11.1.0"; version = "11.1.3";
subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ]; subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
@ -26,7 +16,7 @@ buildGoModule rec {
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw="; hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco=";
}; };
# borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@ -46,9 +36,6 @@ buildGoModule rec {
jq moreutils python3 jq moreutils python3
# @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild` # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild`
] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
postPatch = ''
${patchGoVersion}
'';
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
export HOME="$(mktemp -d)" export HOME="$(mktemp -d)"
@ -73,17 +60,13 @@ buildGoModule rec {
disallowedRequisites = [ offlineCache ]; disallowedRequisites = [ offlineCache ];
vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y="; vendorHash = "sha256-vd3hb7+lmhQPTZO/Xqi59XSPGj5sd218xQAD1bRbUz8=";
proxyVendor = true; proxyVendor = true;
nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ] nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ]
++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ]; ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
postPatch = ''
${patchGoVersion}
'';
postConfigure = '' postConfigure = ''
# Generate DI code that's required to compile the package. # Generate DI code that's required to compile the package.
# From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35