summary refs log tree commit diff
path: root/pkgs/servers
diff options
context:
space:
mode:
authorWilliButz <wbutz@cyberfnord.de>2020-08-20 10:00:54 +0200
committerWilliButz <wbutz@cyberfnord.de>2020-08-20 10:23:51 +0200
commit003fa57c6484a63af1e72470fa2b101f4de7a79e (patch)
tree2bd8748c85d9db2cf6eca7e1b5a5045ad51162f9 /pkgs/servers
parent6c0a602e0d3504969a29f5272ac9cc0562068cf4 (diff)
downloadnixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar.gz
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar.bz2
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar.lz
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar.xz
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.tar.zst
nixpkgs-003fa57c6484a63af1e72470fa2b101f4de7a79e.zip
grafana: 7.0.4 -> 7.1.3, enable checkPhase
Diffstat (limited to 'pkgs/servers')
-rw-r--r--pkgs/servers/monitoring/grafana/default.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 4f0122c4fca..1f4d91c9c87 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;