diff options
| author | Uri Baghin <uri@canva.com> | 2023-10-24 15:53:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-24 15:53:40 +0800 |
| commit | b1fda7cd4ae623a6b697074b26eed6355e3753b8 (patch) | |
| tree | 57fa36dbbee019ce44fe0dad44fcf4745e9781c0 /pkgs/tools/misc/opentelemetry-collector | |
| parent | a9c0720daf7f166918002e6b2fcc272615c95ae0 (diff) | |
| parent | d733b4e072e3a367eceb6edb6253739fc8512619 (diff) | |
| download | nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar.gz nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar.bz2 nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar.lz nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar.xz nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.tar.zst nixpkgs-b1fda7cd4ae623a6b697074b26eed6355e3753b8.zip | |
Merge pull request #255969 from spacekitteh/patch-38
opentelemetry-collector-contrib: 0.78.0 -> 0.87.0
Diffstat (limited to 'pkgs/tools/misc/opentelemetry-collector')
| -rw-r--r-- | pkgs/tools/misc/opentelemetry-collector/contrib.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/pkgs/tools/misc/opentelemetry-collector/contrib.nix index d5cddeb6e24..e928544d240 100644 --- a/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,17 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.78.0"; + version = "0.87.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-5oTXPQU1aT8Xm1bTjbnauBUqzBqBH+yBzC1tmLHA0v0="; + sha256 = "sha256-b1TCj3aKupqUMQ74O58O5WJfQM9tj1G0ny5YeeilFAM="; }; + # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-ABaRedZXPr2q2AmslVNIJUvONZa4tv7OkxBLR9GuBRE="; + vendorHash = "sha256-o/51Z2Zmdza3pNZa0u3j4uG46orE9S7pUsZOXjHKrnI="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; @@ -38,6 +39,8 @@ buildGoModule rec { # it instead of trusting the global $PATH. propagatedBuildInputs = lib.optionals withSystemd [ systemdMinimal ]; + preCheck = "export CGO_ENABLED=1"; + # This test fails on darwin for mysterious reasons. checkFlags = lib.optionals stdenv.isDarwin [ "-skip" "TestDefaultExtensions/memory_ballast" ]; |