diff options
author | WilliButz <WilliButz@users.noreply.github.com> | 2020-05-23 20:39:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-23 20:39:10 +0200 |
commit | 10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234 (patch) | |
tree | 2a7d9504f8a1c93e63c82b0d419115fd1c3a1bb6 /pkgs/servers | |
parent | 6b66f9c8652ec5248dd44cdc2e3409c5d497ed4f (diff) | |
parent | 3d2def38ae8977e8355ee4ed951f2ff320e9b8e3 (diff) | |
download | nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar.gz nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar.bz2 nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar.lz nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar.xz nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.tar.zst nixlib-10b6f23bb07522ee6f9f2b7ac890e0d99fb5b234.zip |
Merge pull request #88242 from JJJollyjim/grafana-7.0.0
grafana: 6.7.3 -> 7.0.0
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7fdd9c70d9a8..23a8bdc60140 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,10 +1,8 @@ -{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomJsSupport ? false, phantomjs2 ? null }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "grafana"; - version = "6.7.3"; - - goPackagePath = "github.com/grafana/grafana"; + version = "7.0.0"; excludedPackages = [ "release_publisher" ]; @@ -12,27 +10,25 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "14yrfrn59r3mxbkhs7mg7nlhnvvrmq959r8w4aj6m7wgr32jj8wl"; + sha256 = "1xicqsn8qg2wwp7p3p3643vqvpp6fbzpx1x7w0mgv9l2va9px8mq"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "17h70h6cz1bdhczjqa68kxzfm4vi95zdnqzah8hcjr7rwnx874kr"; + sha256 = "1x6b61rsflj9dbj0r9wj1wgp4lqwa1q21s3x7ws50scqhq1m3xmk"; }; + vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; + postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ --replace 'var version = "5.0.0"' 'var version = "${version}"' ''; - preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; - postInstall = '' tar -xvf $srcStatic mkdir -p $out/share/grafana mv grafana-*/{public,conf,tools} $out/share/grafana/ - '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { |