diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix
similarity index 100%
rename from pkgs/development/tools/buildah/default.nix
rename to pkgs/by-name/bu/buildah-unwrapped/package.nix
diff --git a/pkgs/development/tools/buildah/wrapper.nix b/pkgs/by-name/bu/buildah/package.nix
similarity index 100%
rename from pkgs/development/tools/buildah/wrapper.nix
rename to pkgs/by-name/bu/buildah/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae80b6547673..8cc2a31172bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1759,9 +1759,6 @@ with pkgs;
     hash = "sha256-YjIZlWOAc1SzvLWs6z3BNlAvAixrDvdDmHqD9m/uWlw=";
   };
 
-  buildah = callPackage ../development/tools/buildah/wrapper.nix { };
-  buildah-unwrapped = callPackage ../development/tools/buildah { };
-
   cabal2nix-unwrapped = haskell.lib.compose.justStaticExecutables (
     haskellPackages.generateOptparseApplicativeCompletions [ "cabal2nix" ] haskellPackages.cabal2nix
   );