JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #95839 from WilliButz/update/grafana-7.1.3

Browse Source 
grafana: 7.0.4 -> 7.1.3, enable checkPhase
This commit is contained in:
Maximilian Bosch 2020-08-20 19:08:02 +02:00 committed by GitHub
commit c59ea8b8a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub }: { lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }:
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "7.0.4"; version = "7.1.3";
excludedPackages = [ "release_publisher" ]; excludedPackages = [ "release_publisher" ];
@ -10,17 +10,15 @@ buildGoModule rec {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7"; sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh";
}; };
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 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2"; sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98";
}; };
vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz";
doCheck = false;
postPatch = '' postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \ substituteInPlace pkg/cmd/grafana-server/main.go \
@ -33,6 +31,8 @@ buildGoModule rec {
mv grafana-*/{public,conf,tools} $out/share/grafana/ mv grafana-*/{public,conf,tools} $out/share/grafana/
''; '';
passthru.tests = { inherit (nixosTests) grafana; };
meta = with lib; { meta = with lib; {
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
license = licenses.asl20; license = licenses.asl20;