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

grafana: 2.0.0-beta1 -> 2.5.0

Browse Source
This commit is contained in:
Jaka Hudoklin 2015-11-16 14:28:03 +01:00
parent 88f5cfc126
commit abda14309f
3 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pkgs/servers/monitoring/grafana/default.nix Normal file
View File

@ -0,0 +1,35 @@
{ lib, goPackages, fetchurl, fetchFromGitHub }:
goPackages.buildGoPackage rec {
version = "2.5.0";
name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana";
subPackages = [ "./" ];
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "11m6jvls3gm9z8g27vxmfx84f22vyjff8bllz5lvpdizydry6zar";
};
srcStatic = fetchurl {
url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}.linux-x64.tar.gz";
sha256 = "1zih0nzlx1sszgc4b5gll4jvsq43ikx782vv991fgy79bb2a5snk";
};
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} $bin/share/grafana/
'';
meta = with lib; {
description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB";
license = licenses.asl20;
homepage = http://grafana.org/;
maintainers = with maintainers; [ offline ];
platforms = with platforms; linux;
};
}

3
pkgs/top-level/all-packages.nix
View File

@ -1668,7 +1668,6 @@ let
gptfdisk = callPackage ../tools/system/gptfdisk { }; gptfdisk = callPackage ../tools/system/gptfdisk { };
grafana-old = callPackage ../development/tools/misc/grafana { }; grafana-old = callPackage ../development/tools/misc/grafana { };
grafana = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; };
grafx2 = callPackage ../applications/graphics/grafx2 {}; grafx2 = callPackage ../applications/graphics/grafx2 {};
@ -9144,6 +9143,8 @@ let
gatling = callPackage ../servers/http/gatling { }; gatling = callPackage ../servers/http/gatling { };
grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; };
groovebasin = callPackage ../applications/audio/groovebasin { }; groovebasin = callPackage ../applications/audio/groovebasin { };
hbase = callPackage ../servers/hbase {}; hbase = callPackage ../servers/hbase {};

14
pkgs/top-level/go-packages.nix
View File

@ -1529,20 +1529,6 @@ let
}; };
}; };
grafana = buildGoPackage rec {
version = "2.0.0-beta1";
name = "grafana-v${version}";
goPackagePath = "github.com/grafana/grafana";
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";
src = fetchFromGitHub {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1b263qj7n72xc5qn0hhrlivqrd0zc8746c9ic11kdxyf81nx4lza";
};
subPackages = [ "./" ];
};
groupcache = buildFromGitHub { groupcache = buildFromGitHub {
rev = "604ed5785183e59ae2789449d89e73f3a2a77987"; rev = "604ed5785183e59ae2789449d89e73f3a2a77987";
owner = "golang"; owner = "golang";