From b6fdcfcb59334b0cbca57e01db3b2f7a76514203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20S=C3=A1nchez?= Date: Wed, 23 Oct 2024 22:33:57 +0100 Subject: [PATCH] opentelemetry-collector-builder: 0.101.0 -> 0.112.0 fix: lowercase maintainer name Update pkgs/by-name/op/opentelemetry-collector-builder/package.nix Co-authored-by: Arne Keller <2012gdwu+github@posteo.de> chore: update vendorHash test: disable network-requiring test cases --- .../op/opentelemetry-collector-builder/package.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix index 1f47665155e2..caf5439ca6ee 100644 --- a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix +++ b/pkgs/by-name/op/opentelemetry-collector-builder/package.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "ocb"; - version = "0.101.0"; + version = "0.112.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "cmd/builder/v${version}"; - hash = "sha256-Ucp00OjyPtHA6so/NOzTLtPSuhXwz6A2708w2WIZb/E="; + hash = "sha256-0eL9J+PrURiNkL6CzUIlcvjyZor8iS9vKX8j0srLlZ8="; }; sourceRoot = "${src.name}/cmd/builder"; - vendorHash = "sha256-MTwD9xkrq3EudppLSoONgcPCBWlbSmaODLH9NtYgVOk="; + vendorHash = "sha256-vZsGSLdzKa4sA/N3RG6Kwn8tMoIIhPJ6uAkM4pheitU="; CGO_ENABLED = 0; ldflags = [ @@ -24,10 +24,12 @@ buildGoModule rec { "-X go.opentelemetry.io/collector/cmd/builder/internal.version=${version}" ]; - # The TestGenerateAndCompile tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping. - checkFlags = [ "-skip TestGenerateAndCompile" ]; + # Some tests download new dependencies for a modified go.mod. Nix doesn't allow network access so skipping. + checkFlags = [ + "-skip TestGenerateAndCompile|TestReplaceStatementsAreComplete|TestVersioning" + ]; - # Rename the to ocb (it's generated as "builder") + # Rename to ocb (it's generated as "builder") postInstall = '' mv $out/bin/builder $out/bin/ocb '';