From 1f62f5853591f4586e4edcabc9648bcde1f1525e Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 21 Nov 2024 15:04:55 +0100 Subject: [PATCH] opentelemetry-collector-builder: move to the package set Since the package versions are best kept in sync, move it close to the other opentelemetry-collector packages. --- .../misc/opentelemetry-collector/builder.nix} | 0 pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) rename pkgs/{by-name/op/opentelemetry-collector-builder/package.nix => tools/misc/opentelemetry-collector/builder.nix} (100%) diff --git a/pkgs/by-name/op/opentelemetry-collector-builder/package.nix b/pkgs/tools/misc/opentelemetry-collector/builder.nix similarity index 100% rename from pkgs/by-name/op/opentelemetry-collector-builder/package.nix rename to pkgs/tools/misc/opentelemetry-collector/builder.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d9ea8c345f99..ea4d3d6fd9b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4794,8 +4794,9 @@ with pkgs; update-systemd-resolved = callPackage ../tools/networking/openvpn/update-systemd-resolved.nix { }; opentelemetry-collector = opentelemetry-collector-releases.otelcol; - opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; + opentelemetry-collector-builder = callPackage ../tools/misc/opentelemetry-collector/builder.nix { }; opentelemetry-collector-contrib = opentelemetry-collector-releases.otelcol-contrib; + opentelemetry-collector-releases = callPackage ../tools/misc/opentelemetry-collector/releases.nix { }; openvswitch-dpdk = callPackage ../by-name/op/openvswitch/package.nix { withDPDK = true; };