Merge remote-tracking branch 'gum/22.05'

5 files changed, 8 insertions, 3 deletions

diff --git a/makefu/2configs/tools/android-pentest.nix b/makefu/2configs/tools/android-pentest.nix
index 1f622a8e0..cb4ca24a8 100644
--- a/makefu/2configs/tools/android-pentest.nix
+++ b/makefu/2configs/tools/android-pentest.nix
@@ -5,7 +5,7 @@
   users.users.makefu.packages = with pkgs; [
     # mitmproxy
     nmap
-    msf
+    metasploit
     #drozer
     #dex2jar
     apktool
diff --git a/makefu/2configs/tools/consoles.nix b/makefu/2configs/tools/consoles.nix
index 7d58daa3f..f213a9b0e 100644
--- a/makefu/2configs/tools/consoles.nix
+++ b/makefu/2configs/tools/consoles.nix
@@ -15,6 +15,7 @@
     nx_game_info
     hactool
     nsrenamer
+    ns-usbloader
     sfo
     exfatprogs exfat-utils exfat
   ];
diff --git a/makefu/2configs/tools/dev.nix b/makefu/2configs/tools/dev.nix
index 918d950f2..66bc9a0e6 100644
--- a/makefu/2configs/tools/dev.nix
+++ b/makefu/2configs/tools/dev.nix
@@ -38,6 +38,10 @@
     ovh-zone
     gen-oath-safe
     cdrtools
+    unrar
+    ffmpeg
+    dnsutils
+
     # network related
     sshuttle
     pciutils
diff --git a/makefu/2configs/tools/media.nix b/makefu/2configs/tools/media.nix
index 14e782e3f..255d1c51a 100644
--- a/makefu/2configs/tools/media.nix
+++ b/makefu/2configs/tools/media.nix
@@ -13,7 +13,7 @@
 
     plowshare
     streamripper
-    youtube-dl
+    yt-dlp
 
     pulseeffects-legacy # for pulse
   ];
diff --git a/makefu/2configs/tools/sec.nix b/makefu/2configs/tools/sec.nix
index acc22d647..6b7aa4fec 100644
--- a/makefu/2configs/tools/sec.nix
+++ b/makefu/2configs/tools/sec.nix
@@ -9,7 +9,7 @@
     iodine
     mtr
     nmap
-    msf
+    metasploit
     thc-hydra
     borgbackup
     ledger