git.iko.soy/typeable/nixpkgs
on master help sign in
grafana: 7.5.2 -> 7.5.6

Changelog: * https://github.com/grafana/grafana/releases/tag/v7.5.3 * https://github.com/grafana/grafana/releases/tag/v7.5.4 * https://github.com/grafana/grafana/releases/tag/v7.5.5 * https://github.com/grafana/grafana/releases/tag/v7.5.6

commitac582ccd61dc6b5b2aaa107c6867fa6c39b3c77b authorTobias Stenzel <ts@flyingcircus.io> dateMon 17 May 2021, 23:12 (5 years ago) parent45e19f2
1 file changed+11−4
compare with master
unifiedsplit
pkgs/servers/monitoring/grafana/default.nix+11−4
pkgs/servers/monitoring/grafana/default.nix+11−4
@@ -2,7 +2,7 @@
22
33buildGoModule rec {
44 pname = "grafana";
5− version = "7.5.2";
5+ version = "7.5.6";
66
77 excludedPackages = [ "release_publisher" ];
88
@@ -10,17 +10,24 @@ buildGoModule rec {
1010 rev = "v${version}";
1111 owner = "grafana";
1212 repo = "grafana";
13− sha256 = "sha256-8Qy5YgJZpvaAjeBAi092Jxg4yAD1fYmMteTRm5b0Q+g=";
13+ sha256 = "1683as90p4zkzhaj52vy60bcmpr77zynys87mjzh3s6ks3xfxn2x";
1414 };
1515
1616 srcStatic = fetchurl {
1717 url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
18− sha256 = "sha256-yVswMNOLX/AFtv45TXm8WcHEytyYgtjvi7V0dRewDdc=";
18+ sha256 = "1mywvm4d116y56rffiywk1hx6wxj1418gf7q0v0hfdlwk1lqi9nz";
1919 };
2020
21− vendorSha256 = "sha256-oh3GB6Iaqy05IS2MU5LJqTXnlr0vtkACZA6wpmW7W2Q=";
21+ vendorSha256 = "01a5v292x59fmayjkqnf4c8k8viasxr2s2khs4yrv6p829lx3hq2";
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.
2327 postPatch = ''
28+ substituteInPlace go.mod \
29+ --replace 'github.com/grafana/grafana-aws-sdk v0.3.0' ""
30+
2431 substituteInPlace pkg/cmd/grafana-server/main.go \
2532 --replace 'var version = "5.0.0"' 'var version = "${version}"'
2633 '';