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: bbda35a20ff4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5a16b0a9f9d6
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 5, 2019

  1. grafana: 6.0.2 -> 6.1.0 (#58917) 

    (cherry picked from commit cfe5698)
    @WilliButz @globin
    WilliButz authored and globin committed Apr 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    776b304 View commit details

  2. grafana: 6.1.0 -> 6.1.1 

    (cherry picked from commit 26d41fb)
    @WilliButz @globin
    WilliButz authored and globin committed Apr 5, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    globin Robin Gloster
    GPG key ID: D5C458DF6DD97EDF
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    5a16b0a View commit details
Showing with 3 additions and 3 deletions.
  1. +3 −3 pkgs/servers/monitoring/grafana/default.nix
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,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

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

@@ -11,12 +11,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1qvkk83yhryvy73c56mp5vdlbrwz4ra5al3flah8s2m9dhbs89bi";
sha256 = "1n7wr89sbpdi1zpqvmyidp9y0mjdnxgdv7bj6gc9kkp6dskqk1r8";
};

srcStatic = fetchurl {
url = "https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1lvcd2i7jv7s4qrxc1p0ifsycdy0v0hzwgiz4kl2k3w21c50k69l";
sha256 = "0dbqqm3z2z4bxgq9y2lbjx6znjgqmsyz8qih2b4z6j3fvixfa5sw";
};

postPatch = ''