diff options
author | WilliButz <wbutz@cyberfnord.de> | 2018-03-08 14:14:47 +0100 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2018-03-12 23:37:29 +0100 |
commit | ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554 (patch) | |
tree | 042ff1faf413ccbe366a4ebde1f59e29ccf218e9 | |
parent | 28264de9fcbf24b9c5076199a4dc4d8375f7964b (diff) | |
download | nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar.gz nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar.bz2 nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar.lz nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar.xz nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.tar.zst nixpkgs-ef90ff2d8ea13ebf222eb437fb6db8fcbbc1a554.zip |
grafana: 5.0.0 -> 5.0.1
-rw-r--r-- | nixos/tests/grafana.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 16b8181498a..d45776c3ee2 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -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/"); ''; }) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 876209b9b02..b255a153a2b 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -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"; |