diff --git a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
similarity index 69%
rename from pkgs/applications/version-management/git-annex-metadata-gui/default.nix
rename to pkgs/by-name/gi/git-annex-metadata-gui/package.nix
index d92ee4662222..084377bb1819 100644
--- a/pkgs/applications/version-management/git-annex-metadata-gui/default.nix
+++ b/pkgs/by-name/gi/git-annex-metadata-gui/package.nix
@@ -1,22 +1,20 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  pyqt5,
   qt5,
-  git-annex-adapter,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "git-annex-metadata-gui";
   version = "0.2.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alpernebbi";
     repo = "git-annex-metadata-gui";
-    rev = "v${version}";
-    sha256 = "03kch67k0q9lcs817906g864wwabkn208aiqvbiyqp1qbg99skam";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VU2d0ls4XOzj2jgqBISdS3FODHoGpBOQZjRhMI+BbA4=";
   };
 
   prePatch = ''
@@ -29,9 +27,13 @@ buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
-  propagatedBuildInputs = [
-    pyqt5
-    git-annex-adapter
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies = [
+    python3Packages.pyqt5
+    python3Packages.git-annex-adapter
   ];
 
   meta = {
@@ -45,4 +47,4 @@ buildPythonApplication rec {
     license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 69687ddf5987..6151b1030a3c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1121,12 +1121,6 @@ with pkgs;
 
   github-cli = gh;
 
-  git-annex-metadata-gui =
-    libsForQt5.callPackage ../applications/version-management/git-annex-metadata-gui
-      {
-        inherit (python3Packages) buildPythonApplication pyqt5 git-annex-adapter;
-      };
-
   git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
     inherit (python3Packages)
       buildPythonApplication