diff options
| author | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-11-16 14:28:03 +0100 |
|---|---|---|
| committer | Jaka Hudoklin <jakahudoklin@gmail.com> | 2015-11-16 14:59:16 +0100 |
| commit | abda14309f8b54fccf9aea00a57d8c6dc6a88a72 (patch) | |
| tree | bea731cab0c44c16159798797fec341f2abf0cc0 /pkgs | |
| parent | 88f5cfc1268dfd75556f8d890d841efe56243fd4 (diff) | |
| download | nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar.gz nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar.bz2 nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar.lz nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar.xz nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.tar.zst nixlib-abda14309f8b54fccf9aea00a57d8c6dc6a88a72.zip | |
grafana: 2.0.0-beta1 -> 2.5.0
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 35 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/go-packages.nix | 14 |
3 files changed, 37 insertions, 15 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix new file mode 100644 index 000000000000..24462fd5febe --- /dev/null +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66382269ebaa..e740579047b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1668,7 +1668,6 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; grafana-old = callPackage ../development/tools/misc/grafana { }; - grafana = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -9144,6 +9143,8 @@ let gatling = callPackage ../servers/http/gatling { }; + grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; }; + groovebasin = callPackage ../applications/audio/groovebasin { }; hbase = callPackage ../servers/hbase {}; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 700a07cb73bb..a10ef5fb9141 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -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 { rev = "604ed5785183e59ae2789449d89e73f3a2a77987"; owner = "golang"; |