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

Merge pull request #51583 from WilliButz/grafana-update

Browse Source 
grafana: 5.3.4 -> 5.4.0
This commit is contained in:
markuskowa 2018-12-08 15:42:15 +01:00 committed by GitHub
commit 86d80a7b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/monitoring/grafana.nix
View File

@ -169,8 +169,9 @@ in {
Sets the maximum amount of time (in seconds) a connection may be reused. Sets the maximum amount of time (in seconds) a connection may be reused.
For MySQL this setting should be shorter than the `wait_timeout' variable. For MySQL this setting should be shorter than the `wait_timeout' variable.
''; '';
default = 14400; default = "unlimited";
type = types.int; example = 14400;
type = types.either types.int (types.enum [ "unlimited" ]);
}; };
}; };

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

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec { buildGoPackage rec {
version = "5.3.4"; version = "5.4.0";
name = "grafana-${version}"; name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana"; goPackagePath = "github.com/grafana/grafana";
@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "1fhzdkd1hr7l9cy7c9r03pgaxklfgj09q21ljrahqr006gcn1wgn"; sha256 = "090p8j0ddgpc6pz7ax2nz5d196xfhdmgxirszcpkgx2rkidndxlv";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "06andnnnsh68lmra9gc85rsmyx88cwlq2kwzks1d5axpy2mq5arv"; sha256 = "06ysq5njlnb9d5x4jchxlk6zmy2ahb9njnj6n3fblpjzdbkjlcgp";
}; };
postPatch = '' postPatch = ''