Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 28264de9fcbf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef90ff2d8ea1
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Mar 12, 2018

  1. grafana: 5.0.0 -> 5.0.1

    @WilliButz @globin
    WilliButz authored and globin committed Mar 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    shlevy Shea Levy
    GPG key ID: 5C0BD6957D86FE27
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ef90ff2 View commit details
Showing with 4 additions and 4 deletions.
  1. +1 −1 nixos/tests/grafana.nix
  2. +3 −3 pkgs/servers/monitoring/grafana/default.nix
2 changes: 1 addition & 1 deletion nixos/tests/grafana.nix
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 3 additions & 3 deletions pkgs/servers/monitoring/grafana/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

buildGoPackage rec {
version = "5.0.0";
version = "5.0.1";
name = "grafana-${version}";
goPackagePath = "github.com/grafana/grafana";

src = fetchFromGitHub {
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";