@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "grafana";
5− version = "7.5.7";
5+ version = "8.0.0";
66
77 excludedPackages = [ "release_publisher" ];
88
@@ -10,32 +10,32 @@ buildGoModule rec {
1010 rev = "v${version}";
1111 owner = "grafana";
1212 repo = "grafana";
13− sha256 = "sha256-GTQK02zxOBTE+93vT0zLMhAeZ7F3Cq/0lbvbzwB2QZA=";
13+ sha256 = "sha256-HtubiSx4Orf9knZcuYy4eF2qwclX/JVd2Ba9L33tM74=";
1414 };
1515
1616 srcStatic = fetchurl {
1717 url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
18− sha256 = "sha256-IQ7aAuUrNa+bSh5ld6IttujM8AgKUSlu8H7pwzDi164=";
18+ sha256 = "sha256-bwBpkPy4kwfnkRsLOktUgQx+Sm8WJA2d65efMBCnGp4=";
1919 };
2020
21− vendorSha256 = "sha256-AsPRaRLomp090XAKLXLXKm40ESPO4im9qi6VLpLYRQU=";
21+ vendorSha256 = "sha256-Hon5WrhXUvZUtMRxx3XcBDQe3rkRkfqbnXjY3xCzuuM=";
2222
23− # grafana-aws-sdk is specified with two versions which causes a problem later:
24− # go: inconsistent vendoring in /build/source:
25− # github.com/grafana/grafana-aws-sdk@v0.3.0: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
26− # Remove the older one here to fix this.
27− postPatch = ''
28− substituteInPlace go.mod \
29− --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' ""
30−
31− substituteInPlace pkg/cmd/grafana-server/main.go \
32− --replace 'var version = "5.0.0"' 'var version = "${version}"'
33− '';
34−
35− # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
36− # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/dashboard-schemas
3723 preBuild = ''
38− rm -r dashboard-schemas scripts/go
24+ # The testcase makes an API call against grafana.com:
25+ #
26+ # --- Expected
27+ # +++ Actual
28+ # @@ -1,4 +1,4 @@
29+ # (map[string]interface {}) (len=2) {
30+ # - (string) (len=5) "error": (string) (len=16) "plugin not found",
31+ # - (string) (len=7) "message": (string) (len=16) "Plugin not found"
32+ # + (string) (len=5) "error": (string) (len=171) "Failed to send request: Get \"https://grafana.com/api/plugins/repo/test\": dial tcp: lookup grafana.com on [::1]:53: read udp [::1]:48019->[::1]:53: read: connection refused",
33+ # + (string) (len=7) "message": (string) (len=24) "Failed to install plugin"
34+ # }
35+ sed -ie '/func TestPluginInstallAccess/a t.Skip();' pkg/tests/api/plugins/api_install_test.go
36+
37+ # main module (github.com/grafana/grafana) does not contain package github.com/grafana/grafana/scripts/go
38+ rm -r scripts/go
3939 '';
4040
4141 postInstall = ''