diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-index/default.nix
rename to pkgs/by-name/ni/nix-index-unwrapped/package.nix
diff --git a/pkgs/tools/package-management/nix-index/wrapper.nix b/pkgs/by-name/ni/nix-index/package.nix
similarity index 100%
rename from pkgs/tools/package-management/nix-index/wrapper.nix
rename to pkgs/by-name/ni/nix-index/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 79dd5ea3f44f..52acd4dfae46 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15598,9 +15598,6 @@ with pkgs;
   nix-info = callPackage ../tools/nix/info { };
   nix-info-tested = nix-info.override { doCheck = true; };
 
-  nix-index-unwrapped = callPackage ../tools/package-management/nix-index { };
-  nix-index = callPackage ../tools/package-management/nix-index/wrapper.nix { };
-
   nix-linter = haskell.lib.compose.justStaticExecutables (haskellPackages.nix-linter);
 
   nix-prefetch-github = with python3Packages; toPythonApplication nix-prefetch-github;