diff --git a/pkgs/applications/radio/btlejack/default.nix b/pkgs/by-name/bt/btlejack/package.nix similarity index 70% rename from pkgs/applications/radio/btlejack/default.nix rename to pkgs/by-name/bt/btlejack/package.nix index b4e6e30961bb..50afe42db0b9 100644 --- a/pkgs/applications/radio/btlejack/default.nix +++ b/pkgs/by-name/bt/btlejack/package.nix @@ -1,12 +1,10 @@ { lib, - buildPythonApplication, + python3Packages, fetchFromGitHub, - pyserial, - halo, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "btlejack"; version = "2.1.1"; @@ -22,15 +20,15 @@ buildPythonApplication rec { ''; propagatedBuildInputs = [ - pyserial - halo + python3Packages.pyserial + 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 ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 773972abf756..a36494e8e6c9 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=";