From 92f08e07af3bfc3d5334160adef2622a85c75d5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Mar 2020 14:31:01 +0000 Subject: [PATCH 1/3] amass: 3.4.4 -> 3.5.0 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index a79540eaeca91a..548f6cfe78983b 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "1qr9cd22m6w5r32bsvg08bmvyvzz7agaklrghf8n1d23ijj1563p"; + sha256 = "12xd5ig7d69ryflsl0vr0hab4rr10dxxdk3rlbl20am9zrfyz4x4"; }; - modSha256 = "00pd0xi0m3w4xqdqq7ldqcpirq9plln45nhpjrsp5r9bz7yc5wn9"; + modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl"; outputs = [ "out" "wordlists" ]; From 692b8900046f2c25a64472b56f0df62ff9004aba Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 Mar 2020 09:31:01 -0500 Subject: [PATCH 2/3] amass: enable on darwin --- pkgs/tools/networking/amass/default.nix | 7 +++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 548f6cfe78983b..bb3744d8334271 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -1,6 +1,7 @@ { buildGoModule , fetchFromGitHub -, lib +, stdenv +, Security }: buildGoModule rec { @@ -18,13 +19,15 @@ buildGoModule rec { outputs = [ "out" "wordlists" ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' mkdir -p $wordlists cp -R $src/examples/wordlists/*.txt $wordlists gzip $wordlists/*.txt ''; - meta = with lib; { + meta = with stdenv.lib; { description = "In-Depth DNS Enumeration and Network Mapping"; longDescription = '' The OWASP Amass tool suite obtains subdomain names by scraping data diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c30bc270ad47a9..d8ae6648f534aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -563,7 +563,9 @@ in acme-client = callPackage ../tools/networking/acme-client { inherit (darwin) apple_sdk; }; - amass = callPackage ../tools/networking/amass { }; + amass = callPackage ../tools/networking/amass { + inherit (darwin.apple_sdk.frameworks) Security; + }; afew = callPackage ../applications/networking/mailreaders/afew { }; From 5966be5e229d2f355f92091a8ef5bc78512b0c1c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 18 Mar 2020 09:32:01 -0500 Subject: [PATCH 3/3] amass: 3.5.0 -> 3.5.1 --- pkgs/tools/networking/amass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index bb3744d8334271..348104e9591396 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "amass"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "12xd5ig7d69ryflsl0vr0hab4rr10dxxdk3rlbl20am9zrfyz4x4"; + sha256 = "1lir0j6av5zl1jb3513cf7mlrydgnsvy0chn5ihg1fvbdiv5lww9"; }; modSha256 = "1nahmgzd2akkr0zb80k6s1lz2s1fkggvilwi6bnafwqlaw0qxwcl";