diff --git a/pkgs/servers/search/sonic-server/default.nix b/pkgs/by-name/so/sonic-server/package.nix
similarity index 73%
rename from pkgs/servers/search/sonic-server/default.nix
rename to pkgs/by-name/so/sonic-server/package.nix
index cb5521e9dfe8..62857f464dfc 100644
--- a/pkgs/servers/search/sonic-server/default.nix
+++ b/pkgs/by-name/so/sonic-server/package.nix
@@ -1,11 +1,12 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, nix-update-script
-, nixosTests
-, testers
-, sonic-server
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+  nixosTests,
+  rustPlatform,
+  sonic-server,
+  testers,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -21,9 +22,6 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-bH9u38gvH6QEySQ3XFXEHBiSqKKtB+kjcZRLjx4Z6XM=";
 
-  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
-  doCheck = false;
-
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
@@ -31,19 +29,22 @@ rustPlatform.buildRustPackage rec {
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-faligned-allocation";
 
   postPatch = ''
-    substituteInPlace src/main.rs --replace "./config.cfg" "$out/etc/sonic/config.cfg"
+    substituteInPlace src/main.rs \
+      --replace-fail "./config.cfg" "$out/etc/sonic/config.cfg"
   '';
 
   postInstall = ''
     install -Dm444 -t $out/etc/sonic config.cfg
     install -Dm444 -t $out/lib/systemd/system debian/sonic.service
 
-    substituteInPlace \
-      $out/lib/systemd/system/sonic.service \
-      --replace /usr/bin/sonic $out/bin/sonic \
-      --replace /etc/sonic.cfg $out/etc/sonic/config.cfg
+    substituteInPlace $out/lib/systemd/system/sonic.service \
+      --replace-fail /usr/bin/sonic $out/bin/sonic \
+      --replace-fail /etc/sonic.cfg $out/etc/sonic/config.cfg
   '';
 
+  # Found argument '--test-threads' which wasn't expected, or isn't valid in this context
+  doCheck = false;
+
   passthru = {
     tests = {
       inherit (nixosTests) sonic-server;
@@ -62,6 +63,9 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mpl20;
     platforms = platforms.unix;
     mainProgram = "sonic";
-    maintainers = with maintainers; [ pleshevskiy anthonyroussel ];
+    maintainers = with maintainers; [
+      pleshevskiy
+      anthonyroussel
+    ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f5a5ece5be8..9b57916434ed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8315,8 +8315,6 @@ with pkgs;
 
   sbsigntool = callPackage ../tools/security/sbsigntool { };
 
-  sonic-server = callPackage ../servers/search/sonic-server { };
-
   gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { };
 
   gsmlib = callPackage ../development/libraries/gsmlib