diff --git a/pkgs/tools/misc/yafetch/default.nix b/pkgs/by-name/ya/yafetch/package.nix
similarity index 84%
rename from pkgs/tools/misc/yafetch/default.nix
rename to pkgs/by-name/ya/yafetch/package.nix
index b9a453737bff..a52d9d0660cb 100644
--- a/pkgs/tools/misc/yafetch/default.nix
+++ b/pkgs/by-name/ya/yafetch/package.nix
@@ -1,18 +1,18 @@
 {
   lib,
-  stdenv,
+  clangStdenv,
   fetchFromGitHub,
 }:
 
-stdenv.mkDerivation rec {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "yafetch";
   version = "unstable-2022-04-20";
 
   src = fetchFromGitHub {
     owner = "kira64xyz";
-    repo = pname;
+    repo = "yafetch";
     rev = "a118cfc13f0b475db7c266105c10138d838788b8";
-    sha256 = "bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA=";
+    hash = "sha256-bSJlerfbJG6h5dDwWQKHnVLH6DEuvuUyqaRuJ7jvOsA=";
   };
 
   # Use the provided NixOS logo automatically
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     mainProgram = "yafetch";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 194394b74ed3..5e8478037ee8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1089,10 +1089,6 @@ with pkgs;
     wine = wineWowPackages.yabridge;
   };
 
-  yafetch = callPackage ../tools/misc/yafetch {
-    stdenv = clangStdenv;
-  };
-
   ### APPLICATIONS/VERSION-MANAGEMENT
 
   # The full-featured Git.