diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2018-03-01 20:39:24 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-01 20:39:24 +0000 |
| commit | 8d43b8621b3603bc30a16b5f902ae3d2ec6bb336 (patch) | |
| tree | 2f3974d127fa0d234fc3f096b392fcb3ff247ab9 | |
| parent | e340a984e40cd6aeb423a0239aac545da1c3aa43 (diff) | |
| parent | 5ea2c874645bea73427dca9a80384bcf5579f62b (diff) | |
| download | nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar.gz nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar.bz2 nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar.lz nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar.xz nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.tar.zst nixpkgs-8d43b8621b3603bc30a16b5f902ae3d2ec6bb336.zip | |
Merge pull request #36175 from WilliButz/grafana-update
grafana: 4.6.3 -> 5.0.0
| -rw-r--r-- | nixos/modules/services/monitoring/grafana.nix | 2 | ||||
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d48b78ae6d0..921be23f368 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -249,7 +249,7 @@ in { }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} - ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir} + ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir} ''; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 65304541c8d..876209b9b02 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.3"; + version = "5.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,20 +9,20 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j"; + sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03"; + sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,vendor} $bin/share/grafana/ - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs + mv grafana-*/{public,conf,tools} $bin/share/grafana/ + ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { |