diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-04-15 14:39:29 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-04-15 14:53:37 +0200 |
| commit | 4830e6673e8bcfdb6b05ac1381b2c01a1d01b243 (patch) | |
| tree | 8def11bb765d86ee211e21df64baa7842edd8997 | |
| parent | Merge release-22.11 into staging-next-22.11 (diff) | |
| download | nixpkgs-4830e6673e8bcfdb6b05ac1381b2c01a1d01b243.tar.gz | |
grafana: fix a test by upstream patch
(cherry picked from commit f3ec1208820ecd1a6509f from PR #226277)
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index b3162a4c6791..068154b601d1 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, fetchpatch, nixosTests, tzdata, wire }: buildGoModule rec { pname = "grafana"; @@ -18,6 +18,14 @@ buildGoModule rec { sha256 = "sha256-HiKr1ier13xUlrwsJrxo60wwqmiPcza2oOLIfMgFWc0="; }; + 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="; nativeBuildInputs = [ wire ]; |