public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #140748 from Ma27/bump-grafana-2105 

[21.05] grafana: 7.5.10 -> 7.5.11, fix CVE-2021-39226
This commit is contained in:
Maximilian Bosch 2021-10-09 13:33:45 +02:00 committed by GitHub
parent 0f4ceae398 75415b03c0
commit 0c106b8ef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/monitoring/grafana/default.nix
View File

@ -2,23 +2,23 @@
buildGoModule rec { buildGoModule rec {
pname = "grafana"; pname = "grafana";
version = "7.5.10"; version = "7.5.11";
excludedPackages = [ "release_publisher" ]; excludedPackages = "\\(release_publisher\\|macaron\\)";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "grafana"; owner = "grafana";
repo = "grafana"; repo = "grafana";
sha256 = "sha256-e+Nkw9TLQoJfJUSXEGvqqWJMcwjNoN0JoB/zfIPHxYw="; sha256 = "sha256-iwZeTzcXHbc3w7V53h14JAlGEJEW0mJqVtJ/2mj2DLo=";
}; };
srcStatic = fetchurl { srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-xwbd5Qu+btRSqowXCVhmceOGiXiSHeBamJi0Tx79zsc="; sha256 = "sha256-MkTQztSNLelybJo71tXwjBtqCB1CZlQB4DP8SjHFfV0=";
}; };
vendorSha256 = "sha256-FdotpFi1ee92mCX59bBuqzCyjIq6yujWixReYxmKbS8="; vendorSha256 = "sha256-Y+qMmGwZk0NKPvO9VqRDOg8RcSoAgiXRZU/St8BnVgA=";
# grafana-aws-sdk is specified with two versions which causes a problem later: # grafana-aws-sdk is specified with two versions which causes a problem later:
# go: inconsistent vendoring in /build/source: # go: inconsistent vendoring in /build/source: