From d8604f64d925c4f2b2224c06626b87b105235f84 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Fri, 14 Jan 2022 23:26:51 -0700 Subject: [PATCH 1/4] maintainers: add cameronfyfe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d0a90fa4cfe..b07b80db2bd 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1830,6 +1830,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"; From 645c499720e22ba83b68f14db731f4d7f40c7409 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Sun, 16 Jan 2022 16:28:01 -0700 Subject: [PATCH 2/4] ets: init at 0.2.1 --- pkgs/tools/misc/ets/default.nix | 37 ++++++++++++++++++++++++++++++++ pkgs/tools/misc/ets/go-mod.patch | 21 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 60 insertions(+) create mode 100644 pkgs/tools/misc/ets/default.nix create mode 100644 pkgs/tools/misc/ets/go-mod.patch diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix new file mode 100644 index 00000000000..2822d00febd --- /dev/null +++ b/pkgs/tools/misc/ets/default.nix @@ -0,0 +1,37 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ets"; + version = "0.2.1"; + + src = fetchFromGitHub { + owner = "zmwangx"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; + }; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + + ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; + + preBuild = '' + rm -rf fixtures + ''; + + postInstall = '' + mkdir -p $out/share/man/man1 + cp ets.1 $out/share/man/man1 + ''; + + 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/tools/misc/ets/go-mod.patch b/pkgs/tools/misc/ets/go-mod.patch new file mode 100644 index 00000000000..50998e35927 --- /dev/null +++ b/pkgs/tools/misc/ets/go-mod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 3b5d491..b658c8e 100644 +--- a/go.mod ++++ b/go.mod +@@ -8,4 +8,5 @@ require ( + github.com/mattn/go-runewidth v0.0.9 + github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6 + github.com/spf13/pflag v1.0.5 ++ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect + ) +diff --git a/go.sum b/go.sum +index c795477..05ea136 100644 +--- a/go.sum ++++ b/go.sum +@@ -24,4 +24,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn + golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= + golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= + golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= ++golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 080645eb2e7..5018f8f3ef9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5201,6 +5201,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 { }; From 9a9a5b4087935b4461694cbedc40764389aeb58f Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Sun, 16 Jan 2022 16:28:16 -0700 Subject: [PATCH 3/4] ets: use installManPage Co-authored-by: Nikolay Korotkiy --- pkgs/tools/misc/ets/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 2822d00febd..9451a5a043e 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "ets"; @@ -17,13 +17,14 @@ buildGoModule rec { ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; + nativeBuildInputs = [ installShellFiles ]; + preBuild = '' rm -rf fixtures ''; postInstall = '' - mkdir -p $out/share/man/man1 - cp ets.1 $out/share/man/man1 + installManPage ets.1 ''; doCheck = false; From 8d2537a820ccf0201f050a3d4f775f2662ca5058 Mon Sep 17 00:00:00 2001 From: cameronfyfe Date: Wed, 19 Jan 2022 01:23:14 -0700 Subject: [PATCH 4/4] ets: use fetchpatch instead of local patch file --- pkgs/tools/misc/ets/default.nix | 8 ++++++-- pkgs/tools/misc/ets/go-mod.patch | 21 --------------------- 2 files changed, 6 insertions(+), 23 deletions(-) delete mode 100644 pkgs/tools/misc/ets/go-mod.patch diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 9451a5a043e..cccd0db35e2 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: buildGoModule rec { pname = "ets"; @@ -11,7 +11,11 @@ buildGoModule rec { sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; }; - patches = [ ./go-mod.patch ]; + # 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="; diff --git a/pkgs/tools/misc/ets/go-mod.patch b/pkgs/tools/misc/ets/go-mod.patch deleted file mode 100644 index 50998e35927..00000000000 --- a/pkgs/tools/misc/ets/go-mod.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/go.mod b/go.mod -index 3b5d491..b658c8e 100644 ---- a/go.mod -+++ b/go.mod -@@ -8,4 +8,5 @@ require ( - github.com/mattn/go-runewidth v0.0.9 - github.com/riywo/loginshell v0.0.0-20190610082906-2ed199a032f6 - github.com/spf13/pflag v1.0.5 -+ golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect - ) -diff --git a/go.sum b/go.sum -index c795477..05ea136 100644 ---- a/go.sum -+++ b/go.sum -@@ -24,4 +24,6 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn - golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= - golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= - golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0= -+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= - golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=