summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSandro <sandro.jaeckel@gmail.com>2022-12-27 21:25:07 +0100
committerGitHub <noreply@github.com>2022-12-27 21:25:07 +0100
commit375851e5cfa17bf21a4f28285c62af8e52468f19 (patch)
tree8fa0746537eb52e3d5988068c39f5d84a6a9af4b
parentMerge pull request #203017 from urandom2/booster (diff)
parentotel-cli: init at 0.0.20 (diff)
downloadnixpkgs-375851e5cfa17bf21a4f28285c62af8e52468f19.tar.gz
Merge pull request #203582 from urandom2/otel-cli
Fixes https://github.com/NixOS/nixpkgs/issues/143471 Closes https://github.com/NixOS/nixpkgs/pull/143475
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/tools/misc/otel-cli/default.nix30
-rw-r--r--pkgs/top-level/all-packages.nix2
3 files changed, 38 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9fb4956ac2d2..82872597a8b1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4151,6 +4151,12 @@
githubId = 1365692;
name = "Will Fancher";
};
+ emattiza = {
+ email = "nix@mattiza.dev";
+ github = "emattiza";
+ githubId = 11719476;
+ name = "Evan Mattiza";
+ };
emmabastas = {
email = "emma.bastas@protonmail.com";
matrix = "@emmabastas:matrix.org";
diff --git a/pkgs/tools/misc/otel-cli/default.nix b/pkgs/tools/misc/otel-cli/default.nix
new file mode 100644
index 000000000000..68d89d1a6e4a
--- /dev/null
+++ b/pkgs/tools/misc/otel-cli/default.nix
@@ -0,0 +1,30 @@
+{ lib, bash, buildGoModule, fetchFromGitHub, getent, stdenv }:
+
+buildGoModule rec {
+ pname = "otel-cli";
+ version = "0.0.20";
+
+ src = fetchFromGitHub {
+ owner = "equinix-labs";
+ repo = pname;
+ rev = "v${version}";
+ hash = "sha256-bWdkuw0uEE75l9YCo2Dq1NpWXuMH61RQ6p7m65P1QCE=";
+ };
+
+ vendorHash = "sha256-IJ2Gq5z1oNvcpWPh+BMs46VZMN1lHyE+M7kUinTSRr8=";
+
+ preCheck = ''
+ ln -s $GOPATH/bin/otel-cli .
+ '' + lib.optionalString (!stdenv.isDarwin) ''
+ substituteInPlace main_test.go \
+ --replace 'const minimumPath = `/bin:/usr/bin`' 'const minimumPath = `${lib.makeBinPath [ getent ]}`'
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/equinix-labs/otel-cli";
+ description = "A command-line tool for sending OpenTelemetry traces";
+ changelog = "https://github.com/equinix-labs/otel-cli/releases/tag/v${version}";
+ license = licenses.asl20;
+ maintainers = with lib.maintainers; [ emattiza urandom ];
+ };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99851f46c41d..f5b4b2fc6467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10346,6 +10346,8 @@ with pkgs;
ostree = callPackage ../tools/misc/ostree { };
+ otel-cli = callPackage ../tools/misc/otel-cli {};
+
otfcc = callPackage ../tools/misc/otfcc { };
otpclient = callPackage ../applications/misc/otpclient { };