diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-08-20 19:08:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-20 19:08:02 +0200 |
commit | c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38 (patch) | |
tree | a648fa438cce7d7b68cb57b39a308e99076e1099 | |
parent | 88baea464cc7460e0f5e2efa775a4fd02bc1125e (diff) | |
parent | 003fa57c6484a63af1e72470fa2b101f4de7a79e (diff) | |
download | nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.bz2 nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.lz nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.xz nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.zst nixlib-c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.zip |
Merge pull request #95839 from WilliButz/update/grafana-7.1.3
grafana: 7.0.4 -> 7.1.3, enable checkPhase
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 4f0122c4fca9..1f4d91c9c874 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "grafana"; - version = "7.0.4"; + version = "7.1.3"; excludedPackages = [ "release_publisher" ]; @@ -10,17 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "16vdbxq9vhv71jjk689xx0nn3qr4s5ybzbp41dm09pppvxzibpg7"; + sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1362rwmpv1y32w5m1fd9vqffs32244f0h7d5jm5cigiq2l7ix7n2"; + sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98"; }; - vendorSha256 = "00xvpxhnvxdf030978paywl794mlmgqzd94b64hh67946acnbjcl"; - - doCheck = false; + vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ @@ -33,6 +31,8 @@ buildGoModule rec { mv grafana-*/{public,conf,tools} $out/share/grafana/ ''; + passthru.tests = { inherit (nixosTests) grafana; }; + meta = with lib; { description = "Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"; license = licenses.asl20; |