From 3283d8742cf029d38d67a18a7888d46c26adecad Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 30 Oct 2024 19:52:32 +0800
Subject: [PATCH 1/2] toot: move to pkgs/by-name

---
 .../misc/toot/default.nix => by-name/to/toot/package.nix}       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/toot/default.nix => by-name/to/toot/package.nix} (100%)

diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/by-name/to/toot/package.nix
similarity index 100%
rename from pkgs/applications/misc/toot/default.nix
rename to pkgs/by-name/to/toot/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc4f4b0c2b32..e469584d9c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -32769,8 +32769,6 @@ with pkgs;
 
   tony = libsForQt5.callPackage ../applications/audio/tony { };
 
-  toot = callPackage ../applications/misc/toot { };
-
   toipe = callPackage ../applications/misc/toipe { };
 
   toxiproxy = callPackage ../development/tools/toxiproxy { };

From 2d3e8a86f857fc0d39fdb0a3b2612cc6b29d7677 Mon Sep 17 00:00:00 2001
From: aleksana <me@aleksana.moe>
Date: Wed, 30 Oct 2024 20:06:13 +0800
Subject: [PATCH 2/2] toot: 0.42.0 -> 0.45.0

Diff: https://github.com/ihabunek/toot/compare/0.42.0...0.45.0
Changelog:
https://github.com/ihabunek/toot/releases/tag/0.45.0
https://github.com/ihabunek/toot/releases/tag/0.44.1
https://github.com/ihabunek/toot/releases/tag/0.44.0
https://github.com/ihabunek/toot/releases/tag/0.43.0
---
 pkgs/by-name/to/toot/package.nix | 49 +++++++++++++++++++++++---------
 1 file changed, 35 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix
index 496644ff4d42..0f1b5ce9ed1b 100644
--- a/pkgs/by-name/to/toot/package.nix
+++ b/pkgs/by-name/to/toot/package.nix
@@ -1,36 +1,57 @@
-{ lib, fetchFromGitHub, python3Packages, nixosTests }:
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  nixosTests,
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "toot";
-  version = "0.42.0";
+  version = "0.45.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    owner  = "ihabunek";
-    repo   = "toot";
+    owner = "ihabunek";
+    repo = "toot";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-FxA/loJzb/DBI1vWC71IFqdFcwjwIezhBJCGNeBzRoU=";
+    hash = "sha256-xBpqB81LSOq+eGVwEL6fAxBR8UXCduf5syzCdwydW4Q=";
   };
 
   nativeCheckInputs = with python3Packages; [ pytest ];
 
-  propagatedBuildInputs = with python3Packages;
-  [
-    requests beautifulsoup4 future wcwidth
-    urwid urwidgets psycopg2 tomlkit click
+  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 = with lib; {
+  meta = {
     description = "Mastodon CLI interface";
     mainProgram = "toot";
-    homepage    = "https://github.com/ihabunek/toot";
-    license     = licenses.gpl3;
-    maintainers = [ maintainers.matthiasbeyer ];
+    homepage = "https://github.com/ihabunek/toot";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      matthiasbeyer
+      aleksana
+    ];
   };
-
 }