From 214fb8c6d39dd6aec976018cef5286237f35a860 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:47:50 -0700
Subject: [PATCH 1/3] btlejack: use callPackage

---
 pkgs/applications/radio/btlejack/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix
index b4e6e30961bb..166cd407d0e0 100644
--- a/pkgs/applications/radio/btlejack/default.nix
+++ b/pkgs/applications/radio/btlejack/default.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pyserial,
-  halo,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "btlejack";
   version = "2.1.1";
 
@@ -22,8 +20,8 @@ buildPythonApplication rec {
   '';
 
   propagatedBuildInputs = [
-    pyserial
-    halo
+    python3Packages.pyserial
+    python3Packages.halo
   ];
 
   meta = with lib; {

From 0f5c327603514cc7d36f7ebd117829df4b437986 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:48:11 -0700
Subject: [PATCH 2/3] btlejack: remove with lib

---
 pkgs/applications/radio/btlejack/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/applications/radio/btlejack/default.nix
index 166cd407d0e0..50afe42db0b9 100644
--- a/pkgs/applications/radio/btlejack/default.nix
+++ b/pkgs/applications/radio/btlejack/default.nix
@@ -24,11 +24,11 @@ python3Packages.buildPythonApplication rec {
     python3Packages.halo
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/virtualabs/btlejack";
     description = "Bluetooth Low Energy Swiss-army knife";
     mainProgram = "btlejack";
-    license = licenses.mit;
-    maintainers = with maintainers; [ oxzi ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ oxzi ];
   };
 }

From 694c4b2180407f447d2d4e3432de378cf3101bad Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Thu, 26 Jun 2025 11:48:55 -0700
Subject: [PATCH 3/3] btlejack: move to by-name

---
 .../btlejack/default.nix => by-name/bt/btlejack/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/radio/btlejack/default.nix => by-name/bt/btlejack/package.nix} (100%)

diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/by-name/bt/btlejack/package.nix
similarity index 100%
rename from pkgs/applications/radio/btlejack/default.nix
rename to pkgs/by-name/bt/btlejack/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09a5540fec3f..b2e41957124e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1961,8 +1961,6 @@ with pkgs;
 
   brasero = callPackage ../tools/cd-dvd/brasero/wrapper.nix { };
 
-  btlejack = python3Packages.callPackage ../applications/radio/btlejack { };
-
   bsh = fetchurl {
     url = "http://www.beanshell.org/bsh-2.0b5.jar";
     hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";