From df6d55ce69b3a5866e2d8c7767d489edee2d7713 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 11 Jun 2021 11:34:42 +0200 Subject: [PATCH] grafana: 8.0.0 -> 8.0.1 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.1 Also correctly set the version in the UI by declaring `-X main.version`. --- pkgs/servers/monitoring/grafana/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c2d18ae23965..1043b70b5844 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "8.0.0"; + version = "8.0.1"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74="; + sha256 = "sha256-Vs/4urH/XuoVly26YfhFbf/T3x5jdS4BgrVStuTHaHo="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4="; + sha256 = "sha256-b05nUApLjdQW5vbS56HUK+/GXKcHo2UAHybfe6ZTr3U="; }; - vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM="; + vendorSha256 = "sha256-iwB1JtekxFYSHjaV+TqBDqnyE5zt3RJ4dQmf12AA53U="; preBuild = '' # The testcase makes an API call against grafana.com: @@ -38,6 +38,10 @@ buildGoModule rec { rm -r scripts/go ''; + buildFlagsArray = '' + -ldflags=-s -w -X main.version=${version} + ''; + postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana