diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 355f79a94e0..573c8df8c9d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1953,6 +1953,12 @@ githubId = 7435854; name = "Victor Calvert"; }; + cameronfyfe = { + email = "cameron.j.fyfe@gmail.com"; + github = "cameronfyfe"; + githubId = 21013281; + name = "Cameron Fyfe"; + }; cameronnemo = { email = "cnemo@tutanota.com"; github = "cameronnemo"; diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix new file mode 100644 index 00000000000..cccd0db35e2 --- /dev/null +++ b/pkgs/tools/misc/ets/default.nix @@ -0,0 +1,42 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: + +buildGoModule rec { + pname = "ets"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "zmwangx"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; + }; + + # https://github.com/zmwangx/ets/pull/18/ + patches = [ (fetchpatch { + url = "https://github.com/zmwangx/ets/commit/600ec17a9c86ca63cd022d00439cdc4978e2afa9.patch"; + sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE="; + }) ]; + + vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + + ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; + + nativeBuildInputs = [ installShellFiles ]; + + preBuild = '' + rm -rf fixtures + ''; + + postInstall = '' + installManPage ets.1 + ''; + + doCheck = false; + + meta = with lib; { + description = "Command output timestamper"; + homepage = "https://github.com/zmwangx/ets/"; + license = licenses.mit; + maintainers = with maintainers; [ cameronfyfe ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3f45fb3167..65f7c3a009a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5644,6 +5644,8 @@ with pkgs; ethtool = callPackage ../tools/misc/ethtool { }; + ets = callPackage ../tools/misc/ets { }; + ettercap = callPackage ../applications/networking/sniffers/ettercap { }; eventstat = callPackage ../os-specific/linux/eventstat { };