natalie
/
nixpkgs-custom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

grafana: 5.0.0 -> 5.0.1 

(cherry picked from commit ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554)
release-18.03-flake
WilliButz 2018-03-08 14:14:47 +01:00 committed by Franz Pletz
parent 378041f1b6
commit 442da8b898
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/grafana.nix
View File

@ -20,6 +20,6 @@ import ./make-test.nix ({ lib, ... }:
$machine->start;
$machine->waitForUnit("grafana.service");
$machine->waitForOpenPort(3000);
$machine->succeed("curl -sS http://127.0.0.1:3000/");
$machine->succeed("curl -sSfL http://127.0.0.1:3000/");
'';
})

6
pkgs/servers/monitoring/grafana/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:
buildGoPackage rec {
version = "5.0.0";
version = "5.0.1";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";
@ -9,12 +9,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9";
sha256 = "0nvns6ysnl7a4blcq9iyhhn9nxhk8fpwkfzlyvm8dx6y8hwawlq1";
};
srcStatic = fetchurl {
url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz";
sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd";
sha256 = "1zjy4h2w8dghqziafn23msl29yds9w4q0ryywv1sdrzkb1331cyk";
};
preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace";