diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-23 12:02:04 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-23 12:02:04 +0000 |
| commit | 2c2c0379b759c234413de63478847266cdc8ed93 (patch) | |
| tree | 92ebd45d1cd2a17d5fb63ff5c6c006a4d8f25f7e /pkgs/servers/tracing/tempo/default.nix | |
| parent | 1026189bd67abfd6f7def1c697988217caafbc5c (diff) | |
| parent | a3b463e8874fe9182e758919eeb18bb44070097c (diff) | |
| download | nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.gz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.bz2 nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.lz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.xz nixlib-2c2c0379b759c234413de63478847266cdc8ed93.tar.zst nixlib-2c2c0379b759c234413de63478847266cdc8ed93.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/servers/tracing/tempo/default.nix')
| -rw-r--r-- | pkgs/servers/tracing/tempo/default.nix | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 2a992d01ad6a..d837b6b26427 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: buildGoModule rec { pname = "tempo"; @@ -12,6 +12,15 @@ buildGoModule rec { hash = "sha256-23wjD8HTSEGonIMAWCoKORMLIISASxlN4FeY+Bmt/+I="; }; + patches = [ + # Backport patch for Go 1.21 compatibility + # FIXME: remove after 2.3.0 + (fetchpatch { + url = "https://github.com/grafana/tempo/commit/0d37e8f0edd8a96876b0a5f5ab97ef79ff04608f.patch"; + hash = "sha256-YC59g5pdcrwJeQ4raS0Oq+fZvRBKFj4johZtGTAYpEs="; + }) + ]; + vendorHash = null; subPackages = [ |