diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/by-name/ni/nixpkgs-fmt/package.nix
similarity index 100%
rename from pkgs/tools/nix/nixpkgs-fmt/default.nix
rename to pkgs/by-name/ni/nixpkgs-fmt/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ce4831c4b39d..5cac9bed5564 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -39085,8 +39085,6 @@ with pkgs;
 
   nixfmt-classic = haskellPackages.nixfmt.bin;
 
-  nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
-
   nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { };
 
   nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { };