From ae541afbf9daf0eeb077ae272557026c0169009b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 18 Jun 2021 18:32:03 +0200 Subject: [PATCH] grafana: 8.0.2 -> 8.0.3 ChangeLog: https://github.com/grafana/grafana/releases/tag/v8.0.3 --- pkgs/servers/monitoring/grafana/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 7420fa22e638..99acc52b9de2 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "grafana"; - version = "8.0.2"; + version = "8.0.3"; excludedPackages = [ "release_publisher" ]; @@ -10,25 +10,16 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-kCsrLZ0EbuMwqqDvUvhm8+B/vh6FpeJ5zkwste+qwyQ="; + sha256 = "sha256-GGtmsz3c7Q6mEGCJ6cdz2CjOW0ovZZW8j6LMfFgrMZ4="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-QBMGLN3MjYJcv2vbs9GHfrCixcV7nH+Ox3o6/YtRYak="; + sha256 = "sha256-2x0FhKinrXAFenJcUDh4Q3RJNBrqixKBNZT7BZNNOj8="; }; vendorSha256 = "sha256-x7sSVIim/TOhMTbnRK/fpgxiSRSO8KwGILTE2i1gU3U="; - patches = [ - # https://github.com/grafana/grafana/pull/35635 (fixes declarative plugins for us) - (fetchpatch { - url = "https://github.com/grafana/grafana/commit/5b5cb948092bdb85e0378fd9ae01b564c4bf65f1.patch"; - sha256 = "sha256-MnCjfLiHsBSWPcxVZ2dC4q8x1/TjzR8uyQhH2Jzgx7o="; - includes = [ "pkg/util/filepath.go" ]; - }) - ]; - preBuild = '' # The testcase makes an API call against grafana.com: #