From 7733d9cae98ab91f36d35005d8aef52873d23b5b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 4 Nov 2021 09:34:43 +0100 Subject: [PATCH] grafana: 8.1.6 -> 8.2.3, fix CVE-2021-41174 ChangeLogs: * https://github.com/grafana/grafana/releases/tag/v8.1.7 * https://github.com/grafana/grafana/releases/tag/v8.2.0 * https://github.com/grafana/grafana/releases/tag/v8.2.1 * https://github.com/grafana/grafana/releases/tag/v8.2.2 * https://github.com/grafana/grafana/releases/tag/v8.2.3 Apart from a few new features, most notably is CVE-2021-41174[1]. Darwin is temporarily marked as unsupported because Go 1.17 doesn't support the Apple SDK versions used in `nixpkgs`. [1] https://nvd.nist.gov/vuln/detail/CVE-2021-41174 --- pkgs/servers/monitoring/grafana/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 848bcaca4340..1ebac5327339 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata }: +{ lib, buildGo117Module, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: -buildGoModule rec { +buildGo117Module rec { pname = "grafana"; - version = "8.1.6"; + version = "8.2.3"; excludedPackages = "\\(alert_webhook_listener\\|clean-swagger\\|release_publisher\\|slow_proxy\\|slow_proxy_mac\\|macaron\\)"; @@ -10,17 +10,23 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-PUVRFa3b+O2lY6q3vO+rLUcC+fx80iB78tt60f6Vugk="; + sha256 = "sha256-GC4pHwthsXu/+dXb1cBk5bC0O6NnyiChC+UWleq7JzA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-So9xzet9kPkjcDwNts3iXlCd+u2uiXTo0LVcLc8toyk="; + sha256 = "sha256-LOswYw0P3dy6arrmUbnzBU0ie2YcPtk6xqtp9CowG2s="; }; - vendorSha256 = "sha256-dn4sliRp58oZALZ8Iu7kE83ntkcMIU84Xr5WoeXlhCI="; + vendorSha256 = "sha256-yZbdUiuRNFRaXduOYps5ygiaUgvNXw+Ah4wZrfYcJlY="; + + nativeBuildInputs = [ wire ]; preBuild = '' + # Generate DI code that's required to compile the package. + # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35 + wire gen -tags oss ./pkg/server + # The testcase makes an API call against grafana.com: # # --- Expected