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

Commits on Mar 6, 2019

  1. grafana: 6.0.0 -> 6.0.1

    WilliButz committed Mar 6, 2019
    Copy the full SHA
    881ab86 View commit details

Commits on Mar 7, 2019

  1. Merge pull request #56968 from WilliButz/grafana-update

    grafana: 6.0.0 -> 6.0.1
    fpletz authored Mar 7, 2019
    Copy the full SHA
    619ae61 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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }:

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

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

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

postPatch = ''