diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/by-name/ug/ugarit/eggs.nix
similarity index 100%
rename from pkgs/tools/backup/ugarit/eggs.nix
rename to pkgs/by-name/ug/ugarit/eggs.nix
diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/by-name/ug/ugarit/package.nix
similarity index 79%
rename from pkgs/tools/backup/ugarit/default.nix
rename to pkgs/by-name/ug/ugarit/package.nix
index 02ea3966d1b9..12504c80de8e 100644
--- a/pkgs/tools/backup/ugarit/default.nix
+++ b/pkgs/by-name/ug/ugarit/package.nix
@@ -1,20 +1,19 @@
 {
   lib,
-  eggDerivation,
-  fetchegg,
+  chickenPackages_4,
   z3,
 }:
 
 let
-  eggs = import ./eggs.nix { inherit eggDerivation fetchegg; };
+  eggs = import ./eggs.nix { inherit (chickenPackages_4) eggDerivation fetchegg; };
 in
 
-eggDerivation rec {
+chickenPackages_4.eggDerivation rec {
   pname = "ugarit";
   version = "2.0";
   name = "${pname}-${version}";
 
-  src = fetchegg {
+  src = chickenPackages_4.fetchegg {
     inherit version;
     name = pname;
     sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
diff --git a/pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch b/pkgs/by-name/ug/ugarit/posix-extras-add-sysmacros-include.patch
similarity index 100%
rename from pkgs/tools/backup/ugarit/posix-extras-add-sysmacros-include.patch
rename to pkgs/by-name/ug/ugarit/posix-extras-add-sysmacros-include.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 622920e422e3..dea5296cd5fd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3749,10 +3749,6 @@ with pkgs;
     withRedis = true;
   };
 
-  ugarit = callPackage ../tools/backup/ugarit {
-    inherit (chickenPackages_4) eggDerivation fetchegg;
-  };
-
   ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker {
     inherit (chickenPackages_4) eggDerivation fetchegg;
   };