Merge pull request #74474 from WilliButz/grafana-update

grafana: 6.4.5 -> 6.5.1
This commit is contained in:
Robin Gloster 2019-11-28 13:47:20 +01:00 committed by GitHub
commit ca7e098d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -2,7 +2,7 @@
buildGoPackage rec { buildGoPackage rec {
pname = "grafana"; pname = "grafana";
version = "6.4.5"; version = "6.5.1";
goPackagePath = "github.com/grafana/grafana"; goPackagePath = "github.com/grafana/grafana";
@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "0chfskz3j0jc25fj7zpbs46lp6a426gz6nigiana04sqylmxm851"; sha256 = "1hcfn9dgx8vabadagm69dgk5sdyc1kxkbma2ryfdb0v6vpm01784";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "0sfs8kv4sxacly39ddy05i3gv14i7d14fc1fb952kdx0zzm8zray"; sha256 = "1m2rxxgs8sf8qrg0bk3i2gy17q6n4nk4cwlp9bbffwmwcmf78gnw";
}; };
postPatch = '' postPatch = ''

View File

@ -15093,7 +15093,7 @@ in
gofish = callPackage ../servers/gopher/gofish { }; gofish = callPackage ../servers/gopher/gofish { };
grafana = callPackage ../servers/monitoring/grafana { grafana = callPackage ../servers/monitoring/grafana {
buildGoPackage = buildGo112Package; buildGoPackage = buildGo113Package;
}; };
grafana-loki = callPackage ../servers/monitoring/loki { }; grafana-loki = callPackage ../servers/monitoring/loki { };