From 46f8c78337c51b188ba9fa4ea48617d433a26144 Mon Sep 17 00:00:00 2001 From: 06kellyjac Date: Fri, 25 Feb 2022 13:10:40 +0000 Subject: [PATCH] opentelemetry-collector-contrib: 0.44.0 -> 0.45.1 --- pkgs/tools/misc/opentelemetry-collector/contrib.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index ddd21cbab5a0..4bfc390335d8 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -1,24 +1,29 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv }: buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.44.0"; + version = "0.45.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-JRkS51ybFnvCn3pKhDeXO0R23wzT1uso1PtXZllF1fA="; + sha256 = "sha256-HoDQK/WyvDQgYBr6WPJ+bZE3GTx74SGgSj1P6i8AfL0="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorSha256 = "sha256-4MnUDakBfo3nhSqMjDYiqx6FNZvAB/9DE1yxOvmQAAk="; + vendorSha256 = "sha256-e33EV1DGpR3XL70sjfCSMeuOSyh334+AkHnE+vqHrh0="; subPackages = [ "cmd/otelcontribcol" ]; + # CGO_ENABLED=0 required for mac - "error: 'TARGET_OS_MAC' is not defined, evaluates to 0" + # https://github.com/shirou/gopsutil/issues/976 + CGO_ENABLED = if stdenv.isLinux then 1 else 0; + ldflags = [ "-s" "-w"