NixOS · Dec 5, 2018
Showing with 15 additions and 9 deletions.

+13 −7 pkgs/tools/networking/amass/default.nix

+2 −2 pkgs/tools/networking/amass/deps.nix
diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix
@@ -1,29 +1,32 @@
 { buildGoPackage
 , fetchFromGitHub
+, fetchpatch
 , lib
 }:
 
 buildGoPackage rec {
   name = "amass-${version}";
-  version = "2.8.3";
+  version = "2.8.5";
 
   goPackagePath = "github.com/OWASP/Amass";
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "Amass";
     rev = version;
-    sha256 = "1pidi7bpg5z04l6ryfd7rqxshayvkqmgav0f6f1fxz4jwrmx9nnc";
+    sha256 = "1nsqg1p7hcv369d53n13xps3ks6fgzkkp6v9q87l04yj32nbr5qy";
   };
 
-  # NOTE: this must be removed once amass > 2.8.3 is released. This version has
-  # a broken import caused by the project migrating to a new home.
-  preBuild = ''
-    sed -e 's:github.com/caffix/amass/amass/core:github.com/OWASP/Amass/amass/core:g' -i "go/src/${goPackagePath}/cmd/amass.netdomains/main.go"
-  '';
+  outputs = [ "bin" "out" "wordlists" ];
 
   goDeps = ./deps.nix;
 
+  postInstall = ''
+    mkdir -p $wordlists
+    cp -R $src/wordlists/*.txt $wordlists
+    gzip $wordlists/*.txt
+  '';
+
   meta = with lib; {
     description = "In-Depth DNS Enumeration and Network Mapping";
     longDescription = ''
@@ -33,6 +36,9 @@ buildGoPackage rec {
       uses the IP addresses obtained during resolution to discover associated
       netblocks and ASNs. All the information is then used to build maps of the
       target networks.
+
+      Amass ships with a set of wordlist (to be used with the amass -w flag)
+      that are found under the wordlists output.
       '';
     homepage = https://www.owasp.org/index.php/OWASP_Amass_Project;
     license = licenses.asl20;

diff --git a/pkgs/tools/networking/amass/deps.nix b/pkgs/tools/networking/amass/deps.nix