From 8091183e02e4e2a70a96f500f98a9d2e1365ffe4 Mon Sep 17 00:00:00 2001 From: WilliButz Date: Tue, 26 Nov 2019 10:23:13 +0100 Subject: [PATCH] grafana: 6.4.5 -> 6.5.0, build with go 1.13 (cherry picked from commit ce74c85ce771f70d65bd0e8c986f4de475377578) --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 2a708a6d8c7c..64c33297660c 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.4.5"; + version = "6.5.0"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "0chfskz3j0jc25fj7zpbs46lp6a426gz6nigiana04sqylmxm851"; + sha256 = "0g1rlh8himv3njsviy95grd9cp64hm98s9lc0f1gy2lvi2f9bxx4"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0sfs8kv4sxacly39ddy05i3gv14i7d14fc1fb952kdx0zzm8zray"; + sha256 = "1jqzgyh4cyj1m9cmyvmhfh79j4dac84j7l1pxs6ppbxc4ym07g8g"; }; postPatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 05e9ca848813..a2d0b60dc794 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14681,7 +14681,9 @@ in gofish = callPackage ../servers/gopher/gofish { }; - grafana = callPackage ../servers/monitoring/grafana { }; + grafana = callPackage ../servers/monitoring/grafana { + buildGoPackage = buildGo113Package; + }; grafana-loki = callPackage ../servers/monitoring/loki { };