From 7184ad9e26247cbe69fe301ff1c218c07300a83f Mon Sep 17 00:00:00 2001
From: Makuru <Makuru@Makuru.org>
Date: Wed, 4 Dec 2024 17:43:05 +0100
Subject: [PATCH] hashcat: moved hashcat to `pkgs/by-name/ha/hashcat/`

---
 .../default.nix => by-name/ha/hashcat/package.nix}   | 12 +++++-------
 .../security => by-name/ha}/hashcat/rocm1.patch      |  0
 .../security => by-name/ha}/hashcat/rocm2.patch      |  0
 pkgs/top-level/all-packages.nix                      |  6 +++---
 4 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{tools/security/hashcat/default.nix => by-name/ha/hashcat/package.nix} (96%)
 rename pkgs/{tools/security => by-name/ha}/hashcat/rocm1.patch (100%)
 rename pkgs/{tools/security => by-name/ha}/hashcat/rocm2.patch (100%)

diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/by-name/ha/hashcat/package.nix
similarity index 96%
rename from pkgs/tools/security/hashcat/default.nix
rename to pkgs/by-name/ha/hashcat/package.nix
index 5c471f3e2b2b05..8d521428b6b158 100644
--- a/pkgs/tools/security/hashcat/default.nix
+++ b/pkgs/by-name/ha/hashcat/package.nix
@@ -116,9 +116,7 @@ stdenv.mkDerivation {
       makeWrapper
       autoAddDriverRunpath
     ]
-    ++ [ openclLibs ]
-    ++ lib.optionals enableRocm [ rocmLibs ]
-    ++ lib.optionals enableCuda [ cudaLibs ];
+    ++ [ openclLibs ] ++ lib.optionals enableRocm [ rocmLibs ] ++ lib.optionals enableCuda [ cudaLibs ];
 
   buildInputs =
     [
@@ -129,10 +127,10 @@ stdenv.mkDerivation {
     ++ lib.optionals rocmRequested [ rocmLibs ]
     ++ lib.optionals cudaRequested [ cudaLibs ];
 
-    patches = lib.optionals enableRocm [
-      ./rocm1.patch
-      ./rocm2.patch
-    ];
+  patches = lib.optionals enableRocm [
+    ./rocm1.patch
+    ./rocm2.patch
+  ];
   makeFlags =
     [
       "PREFIX=${placeholder "out"}"
diff --git a/pkgs/tools/security/hashcat/rocm1.patch b/pkgs/by-name/ha/hashcat/rocm1.patch
similarity index 100%
rename from pkgs/tools/security/hashcat/rocm1.patch
rename to pkgs/by-name/ha/hashcat/rocm1.patch
diff --git a/pkgs/tools/security/hashcat/rocm2.patch b/pkgs/by-name/ha/hashcat/rocm2.patch
similarity index 100%
rename from pkgs/tools/security/hashcat/rocm2.patch
rename to pkgs/by-name/ha/hashcat/rocm2.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e78f234197949..7a08554d2c552c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3736,12 +3736,12 @@ with pkgs;
 
   haguichi = callPackage ../tools/networking/haguichi { };
 
-  hashcat = callPackage ../tools/security/hashcat {
+  hashcat = callPackage ../by-name/ha/hashcat {
     acceleration = null;
     inherit (darwin.apple_sdk.frameworks)  IOKit Metal OpenCL;
   };
-  hashcat-rocm = callPackage ../tools/security/hashcat { acceleration = "rocm"; };
-  hashcat-cuda = callPackage ../tools/security/hashcat { acceleration = "cuda"; };
+  hashcat-rocm = callPackage ../by-name/ha/hashcat/package.nix { acceleration = "rocm"; };
+  hashcat-cuda = callPackage ../by-name/ha/hashcat/package.nix { acceleration = "cuda"; };
 
 
   haskell-language-server = callPackage ../development/tools/haskell/haskell-language-server/withWrapper.nix { };