diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-06-04 21:27:03 +0000 |
| commit | 5487bcdfdd2c750274761263f3d65c00d7f6897b (patch) | |
| tree | 6584bf52d6b70a59e10cd8eef51280f42ad2afa8 /pkgs/servers/monitoring/grafana/default.nix | |
| parent | 8b9edf1e0fa01a9de7db6ead1b7b28f23b91b3e2 (diff) | |
| parent | 1623d81e507520b5207307bc2bf8cfcddf90944a (diff) | |
| download | nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.gz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.bz2 nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.lz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.xz nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.tar.zst nixpkgs-5487bcdfdd2c750274761263f3d65c00d7f6897b.zip | |
Rebase onto 236cc2971ac72acd90f0ae3a797f9f83098b17ec
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'pkgs/servers/monitoring/grafana/default.nix')
| -rw-r--r-- | pkgs/servers/monitoring/grafana/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index c8cde641723..9e2769d51ca 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, wire, fetchpatch }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub, nixosTests, tzdata, wire }: buildGoModule rec { pname = "grafana"; - version = "8.5.2"; + version = "8.5.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" ]; @@ -10,22 +10,14 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-9m6fu+wwmKpw/ehAIfgLe5YzOqTP3BC6/9mUgLL9XS0="; + sha256 = "sha256-O0R+FsZC//Kj9FBb7Xg2fKxn60h/4ATJiropltGM9EI"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1gq0wyqpgc7crbz8cd4dnwixhx7chnmbl2di4zcqs26g8y30q7rj"; + sha256 = "0812lvcdibviy23y61z9ljy1j5d55ziyvf1y69kxmds2hwsj7iwl"; }; - patches = [ - # skip a flaky test, remove on the next update - (fetchpatch { - url = "https://github.com/grafana/grafana/commit/9e3a01a1bea3f4d5d99e53d55128d79160610349.patch"; - sha256 = "sha256-rzZxNLn074JBb4DW3QC1zWNGe1uLGIlXvnjh60e8B3Q="; - }) - ]; - vendorSha256 = "sha256-ZL+A6Sz0uHg7ZzYHmA4EU5ZxfRXBLyKglk135iQT600="; nativeBuildInputs = [ wire ]; |