From e8f0aac1bd12d81a3a771973d80c081bcce19a21 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sun, 21 Dec 2025 16:20:32 -0500
Subject: [PATCH 1/2] oam-tools: drop

---
 pkgs/by-name/oa/oam-tools/package.nix | 31 ---------------------------
 pkgs/top-level/aliases.nix            |  1 +
 2 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 pkgs/by-name/oa/oam-tools/package.nix

diff --git a/pkgs/by-name/oa/oam-tools/package.nix b/pkgs/by-name/oa/oam-tools/package.nix
deleted file mode 100644
index 709f93a9ecb9..000000000000
--- a/pkgs/by-name/oa/oam-tools/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-}:
-
-buildGoModule rec {
-  pname = "oam-tools";
-  version = "0.1.2";
-
-  src = fetchFromGitHub {
-    owner = "owasp-amass";
-    repo = "oam-tools";
-    tag = "v${version}";
-    hash = "sha256-vt4V8em8Iaz3BVKIqlcAv+VIpJtD58xb3QrkIr4tYuU=";
-  };
-
-  vendorHash = "sha256-yFKYZlA06yE48Wiz0cKgD57JEREwYyYkLM1NZPV8+Xc=";
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  meta = {
-    description = "Analysis and management tools for an Open Asset Model database";
-    homepage = "https://github.com/owasp-amass/oam-tools";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 50ebf60ae40f..115ca8bb8bb3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1198,6 +1198,7 @@ mapAliases {
   nuget-to-nix = throw "nuget-to-nix has been removed as it was deprecated in favor of nuget-to-json. Please use nuget-to-json instead"; # Added 2025-08-28
   nushellFull = throw "'nushellFull' has been renamed to/replaced by 'nushell'"; # Converted to throw 2025-10-27
   o = throw "'o' has been renamed to/replaced by 'orbiton'"; # Converted to throw 2025-10-27
+  oam-tools = throw "'oam-tools' has been become part of amass"; # Added 2025-12-21
   oathToolkit = throw "'oathToolkit' has been renamed to/replaced by 'oath-toolkit'"; # Converted to throw 2025-10-27
   obb = throw "obb has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18

From d546c548ddebc5fb708c994aae65d7fde0c7bf44 Mon Sep 17 00:00:00 2001
From: Justin Restivo <justin@restivo.me>
Date: Sun, 21 Dec 2025 16:34:18 -0500
Subject: [PATCH 2/2] easyeasm: correct runtime dependencies

---
 pkgs/by-name/ea/easyeasm/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ea/easyeasm/package.nix b/pkgs/by-name/ea/easyeasm/package.nix
index d172ece3e536..add0ce949088 100644
--- a/pkgs/by-name/ea/easyeasm/package.nix
+++ b/pkgs/by-name/ea/easyeasm/package.nix
@@ -5,8 +5,9 @@
   makeWrapper,
   amass,
   alterx,
-  oam-tools,
   subfinder,
+  dnsx,
+  httpx,
 }:
 
 buildGoModule rec {
@@ -37,8 +38,9 @@ buildGoModule rec {
         lib.makeBinPath [
           amass
           alterx
-          oam-tools
           subfinder
+          dnsx
+          httpx
         ]
       }"
   '';