diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/by-name/bo/boomerang/package.nix
similarity index 80%
rename from pkgs/development/tools/boomerang/default.nix
rename to pkgs/by-name/bo/boomerang/package.nix
index 8b1fd0e3b229..ed20f89355bf 100644
--- a/pkgs/development/tools/boomerang/default.nix
+++ b/pkgs/by-name/bo/boomerang/package.nix
@@ -4,14 +4,13 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  qtbase,
+  qt5,
   capstone,
   bison,
   flex,
-  wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boomerang";
   version = "0.5.2";
   # NOTE: When bumping version beyond 0.5.2, you likely need to remove
@@ -20,9 +19,9 @@ stdenv.mkDerivation rec {
 
   src = fetchFromGitHub {
     owner = "BoomerangDecompiler";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0xncdp0z8ry4lkzmvbj5d7hlzikivghpwicgywlv47spgh8ny0ix";
+    repo = "boomerang";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PQJvEXxXH7Ip949FfuHbccZP4WlFrl3/pMRn9MFtzHY=";
   };
 
   # Boomerang usually compiles with -Werror but has not been updated for newer
@@ -34,17 +33,19 @@ stdenv.mkDerivation rec {
     cmake
     bison
     flex
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
+
   buildInputs = [
-    qtbase
+    qt5.qtbase
     capstone
   ];
+
   patches = [
     (fetchpatch {
       name = "include-missing-cstdint.patch";
       url = "https://github.com/BoomerangDecompiler/boomerang/commit/3342b0eac6b7617d9913226c06c1470820593e74.patch";
-      sha256 = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc=";
+      hash = "sha256-941IydcV3mqj7AWvXTM6GePW5VgawEcL0wrBCXqeWvc=";
     })
   ];
 
@@ -54,4 +55,4 @@ stdenv.mkDerivation rec {
     description = "General, open source, retargetable decompiler";
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30cc67350b58..df02d9cf0d0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1622,8 +1622,6 @@ with pkgs;
   bogofilter-sqlite = bogofilter.override { database = sqlite; };
   bogofilter-db = bogofilter.override { database = db; };
 
-  boomerang = libsForQt5.callPackage ../development/tools/boomerang { };
-
   bozohttpd-minimal = bozohttpd.override { minimal = true; };
 
   cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (