diff --git a/pkgs/applications/version-management/git-branchstack/default.nix b/pkgs/applications/version-management/git-branchstack/default.nix
deleted file mode 100644
index b536642cbf55..000000000000
--- a/pkgs/applications/version-management/git-branchstack/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib
-, fetchPypi
-, buildPythonApplication
-, git-revise
-}:
-
-buildPythonApplication rec {
-  pname = "git-branchstack";
-  version = "0.2.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
-  };
-
-  buildInputs = [
-    git-revise
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/krobelus/git-branchstack";
-    description = "Efficiently manage Git branches without leaving your local branch";
-    license = licenses.mit;
-    maintainers = [ maintainers.AndersonTorres ];
-  };
-}
diff --git a/pkgs/by-name/gi/git-branchstack/package.nix b/pkgs/by-name/gi/git-branchstack/package.nix
new file mode 100644
index 000000000000..e0cdfaa884df
--- /dev/null
+++ b/pkgs/by-name/gi/git-branchstack/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+}:
+
+let
+  self = python3Packages.buildPythonApplication {
+    pname = "git-branchstack";
+    version = "0.2.0";
+
+    src = fetchPypi {
+      pname = "git-branchstack";
+      inherit (self) version;
+      hash = "sha256-gja93LOcVCQ6l+Cygvsm+3uomvxtvUl6t23GIb/tKyQ=";
+    };
+
+    dependencies = with python3Packages; [
+      git-revise
+    ];
+
+    meta = {
+      homepage = "https://github.com/krobelus/git-branchstack";
+      description = "Efficiently manage Git branches without leaving your local branch";
+      license = lib.licenses.mit;
+      maintainers = with lib.maintainers; [ AndersonTorres ];
+    };
+  };
+in
+self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e3afeaa345d..52a209e119df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2191,8 +2191,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-branchstack = python3.pkgs.callPackage ../applications/version-management/git-branchstack { };
-
   git-bug = callPackage ../applications/version-management/git-bug { };
 
   git-bug-migration = callPackage ../applications/version-management/git-bug-migration { };