nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-10-02 13:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

grafana: 9.4.7 -> 9.4.9

Browse Source 
ChangeLog: 2a6ac647d2/CHANGELOG.md
See also https://grafana.com/blog/2023/04/26/grafana-security-release-new-versions-of-grafana-with-security-fixes-for-cve-2023-28119-and-cve-2023-1387/

Fixes CVE-2023-1387.
This commit is contained in:
Maximilian Bosch
2023-04-27 15:21:46 +02:00
parent d788b37b91
commit d90f33487b
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }:
{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }:
buildGoModule rec {
pname = "grafana";
version = "9.4.7";
version = "9.4.9";
excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ];
@@ -10,23 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
sha256 = "sha256-vhGFZjxO20M3fQhXlEDDkad/yOyFOu48sHZ63MEnWIA=";
sha256 = "sha256-M6Rm1T/oq5HcMe9CNXjwRkBkhJswMYbDmkEyII/KM0s=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0=";
sha256 = "sha256-EA8MJlwzFwqh6EF3sjaYL8vQ4tj5hbnPftT7IGLgZFQ=";
};
patches = [
(fetchpatch { # https://github.com/grafana/grafana/pull/65790
name = "fix-TestIntegrationAMConfigAccess.patch";
url = "https://github.com/grafana/grafana/commit/8500eb1c180b4d49a8e17bfd6df675d821d038a4.diff";
sha256 = "sha256-TWPn9fLjmCbXGXkxAc3NLTN+0XXjsaspaV4gYKg3+Mk=";
})
];
vendorSha256 = "sha256-sUvjZTg2/6UGjc2Qv8YO4IWlS4Y/FzGRVOQ9I/wp/aM=";
vendorSha256 = "sha256-/Gbs/lYjNDz0brCCmsWA+ntWFNnVX8qykKiWqrMwuKQ=";
nativeBuildInputs = [ wire ];

4
pkgs/top-level/all-packages.nix
View File

@@ -23735,7 +23735,9 @@ with pkgs;
gofish = callPackage ../servers/gopher/gofish { };
grafana = callPackage ../servers/monitoring/grafana { };
grafana = callPackage ../servers/monitoring/grafana {
buildGoModule = buildGo120Module;
};
grafanaPlugins = callPackages ../servers/monitoring/grafana/plugins { };
grafana-agent = callPackage ../servers/monitoring/grafana-agent {};