Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 08c346a724eb
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 05a32d8e771d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jun 3, 2020

  1. grafana: 6.7.1 -> 6.7.4

    @Frostman
    Frostman committed Jun 3, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    alexarice Alex Rice
    GPG key ID: 93DDCD7A2B3F3B88
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ca7a4d1 View commit details

  2. Merge pull request #89422 from Frostman/20.03-grafana-6.7.4 

    [20.03] grafana: 6.7.1 -> 6.7.4
    @WilliButz
    WilliButz authored Jun 3, 2020

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    mweinelt Martin Weinelt
    GPG key ID: BD4AA0528F63F17E
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    05a32d8 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.7.1";
version = "6.7.4";

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

@@ -12,12 +12,12 @@ buildGoPackage rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "0isidfnny4rds9mq7gfm3qmsjsg9higiqliri5zy5bc68lz1gnbz";
sha256 = "13n17nls51z2myhiqkha20x2ld6a2fddhzcib41vyhks28fk340x";
};

srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "0pa5g9pgifdi49vklcxnip2a156f5x64i9r2pshdg4gxfdqbxkxy";
sha256 = "13aj9k60r4mfas94ksib8cdzv0195r6a3zkca4af328j4sz26ks5";
};

postPatch = ''