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

Commits on Jan 29, 2020

  1. grafana: 6.5.2 -> 6.5.3 

    (cherry picked from commit e0f9743)
    @WilliButz @globin
    WilliButz authored and globin committed Jan 29, 2020

    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
    98d3f3c View commit details

  2. grafana: 6.5.3 -> 6.6.0 

    (cherry picked from commit c24688e)
    @WilliButz @globin
    WilliButz authored and globin committed Jan 29, 2020

    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
    4fb1fd6 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
@@ -2,7 +2,7 @@

buildGoPackage rec {
pname = "grafana";
version = "6.5.2";
version = "6.6.0";

goPackagePath = "github.com/grafana/grafana";

@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "1hplnb8rv2sxai05qf6il5kza08bkhcawvymr2h9lfdsj7p4kbzy";
sha256 = "0pdhi3lrcfyr60cs93dqskkwlbn7ic4jngaksa3y6kicy6z1nmgz";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "1fnj41lp9b53iyjgis5x8k3g5vl73fdrxsdxnf10d4ma95cwb2qa";
sha256 = "1xp92kbvgyb3pl0sslwdn6bai41ym0yr26wp8qj39rvqamsh86g2";
};

postPatch = ''