diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix
deleted file mode 100644
index 496644ff4d42..000000000000
--- a/pkgs/applications/misc/toot/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
-
-python3Packages.buildPythonApplication rec {
-  pname = "toot";
-  version = "0.42.0";
-
-  src = fetchFromGitHub {
-    owner  = "ihabunek";
-    repo   = "toot";
-    rev = "refs/tags/${version}";
-    sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU=";
-  };
-
-  nativeCheckInputs = with python3Packages; [ pytest ];
-
-  propagatedBuildInputs = with python3Packages;
-  [
-    requests beautifulsoup4 future wcwidth
-    urwid urwidgets psycopg2 tomlkit click
-  ];
-
-  checkPhase = ''
-    py.test
-  '';
-
-  passthru.tests.toot = nixosTests.pleroma;
-
-  meta = with lib; {
-    description = "Mastodon CLI interface";
-    mainProgram = "toot";
-    homepage    = "https://github.com/ihabunek/toot";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.matthiasbeyer ];
-  };
-
-}
diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix
new file mode 100644
index 000000000000..0f1b5ce9ed1b
--- /dev/null
+++ b/pkgs/by-name/to/toot/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  nixosTests,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "toot";
+  version = "0.45.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ihabunek";
+    repo = "toot";
+    rev = "refs/tags/${version}";
+    hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q=";
+  };
+
+  nativeCheckInputs = with python3Packages; [ pytest ];
+
+  build-system = with python3Packages; [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = with python3Packages; [
+    requests
+    beautifulsoup4
+    wcwidth
+    urwid
+    urwidgets
+    tomlkit
+    click
+    pillow
+    term-image
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    py.test
+    runHook postCheck
+  '';
+
+  passthru.tests.toot = nixosTests.pleroma;
+
+  meta = {
+    description = "Mastodon CLI interface";
+    mainProgram = "toot";
+    homepage = "https://github.com/ihabunek/toot";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      aleksana
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f1ae66ed1d8..0f17b22d3023 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32725,8 +32725,6 @@ with pkgs;
 
   tony = libsForQt5.callPackage ../applications/audio/tony { };
 
-  toot = callPackage ../applications/misc/toot { };
-
   toipe = callPackage ../applications/misc/toipe { };
 
   toxiproxy = callPackage ../development/tools/toxiproxy { };