diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/by-name/hw/hwinfo/package.nix
similarity index 97%
rename from pkgs/tools/system/hwinfo/default.nix
rename to pkgs/by-name/hw/hwinfo/package.nix
index 7798a5903e97..c1e8ceb25304 100644
--- a/pkgs/tools/system/hwinfo/default.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-YAhsnE1DJ5UlYAuhDxS/5IpfIJB6DrhCT3E0YiKENjU=";
   };
 
-  nativeBuildInputs = [
-    flex
-  ];
+  nativeBuildInputs = [ flex ];
 
   buildInputs = [
     libuuid
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2be39754e5a5..9b1e179ee593 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8802,8 +8802,6 @@ with pkgs;
 
   humanfriendly = with python3Packages; toPythonApplication humanfriendly;
 
-  hwinfo = callPackage ../tools/system/hwinfo { };
-
   hw-probe = perlPackages.callPackage ../tools/system/hw-probe { };
 
   hybridreverb2 = callPackage ../applications/audio/hybridreverb2 { };