From 6163fc978b120c793b7046449d6a033b864247b9 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 7 Mar 2025 21:06:34 +0100
Subject: [PATCH 1/2] toolong: 1.4.0 -> 1.5.0

---
 pkgs/by-name/to/toolong/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix
index fe120fbead87..1acc17aef255 100644
--- a/pkgs/by-name/to/toolong/package.nix
+++ b/pkgs/by-name/to/toolong/package.nix
@@ -6,7 +6,7 @@
   toolong,
 }:
 
-python311Packages.buildPythonApplication rec {
+python311Packages.buildPythonApplication {
   pname = "toolong";
   version = "1.4.0";
   pyproject = true;
@@ -14,8 +14,8 @@ python311Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "toolong";
-    tag = "v${version}";
-    hash = "sha256-Zd6j1BIrsLJqptg7BXb67qY3DaeHRHieWJoYYCDHaoc=";
+    rev = "5aa22ee878026f46d4d265905c4e1df4d37842ae"; # no tag
+    hash = "sha256-HrmU7HxWKYrbV25Y5CHLw7/7tX8Y5mTsTL1aXGGTSIo=";
   };
 
   build-system = [ python311Packages.poetry-core ];

From c2d578b41cf3db6d03d3e6c9255c1bf3a5a7a5b2 Mon Sep 17 00:00:00 2001
From: polygon <polygon@wh2.tu-dresden.de>
Date: Sat, 8 Mar 2025 15:39:45 +0100
Subject: [PATCH 2/2] toolong: Add patch required for newer textual version in
 nixpkgs

---
 pkgs/by-name/to/toolong/0001-log-view.patch | 41 +++++++++++++++++++++
 pkgs/by-name/to/toolong/package.nix         |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/to/toolong/0001-log-view.patch

diff --git a/pkgs/by-name/to/toolong/0001-log-view.patch b/pkgs/by-name/to/toolong/0001-log-view.patch
new file mode 100644
index 000000000000..f6b29e579127
--- /dev/null
+++ b/pkgs/by-name/to/toolong/0001-log-view.patch
@@ -0,0 +1,41 @@
+diff --git a/src/toolong/log_view.py b/src/toolong/log_view.py
+index e8ec302..f9b58b5 100644
+--- a/src/toolong/log_view.py
++++ b/src/toolong/log_view.py
+@@ -30,7 +30,6 @@
+ from toolong.watcher import WatcherBase
+ from toolong.log_lines import LogLines
+ 
+-
+ SPLIT_REGEX = r"[\s/\[\]]"
+ 
+ MAX_DETAIL_LINE_LENGTH = 100_000
+@@ -201,10 +200,10 @@ async def mount_keys(self) -> None:
+             with self.app.batch_update():
+                 key_container = self.query_one(".key-container")
+                 await key_container.query("*").remove()
+-                bindings = [
+-                    binding
+-                    for (_, binding) in self.app.namespace_bindings.values()
+-                    if binding.show
++                bindings: list[Binding] = [
++                    binding.binding
++                    for binding in self.app.active_bindings.values()
++                    if binding.binding.show
+                 ]
+ 
+                 await key_container.mount_all(
+
+diff --git a/src/toolong/log_view.py b/src/toolong/log_view.py
+index f9b58b5..e603805 100644
+--- a/src/toolong/log_view.py
++++ b/src/toolong/log_view.py
+@@ -118,7 +118,7 @@ def render(self) -> str:
+         return f"[reverse]{self.key_display}[/reverse] {self.description}"
+ 
+     async def on_click(self) -> None:
+-        await self.app.check_bindings(self.key)
++        self.app.simulate_key(self.key)
+ 
+ 
+ class MetaLabel(Label):
diff --git a/pkgs/by-name/to/toolong/package.nix b/pkgs/by-name/to/toolong/package.nix
index 1acc17aef255..43001174c7e8 100644
--- a/pkgs/by-name/to/toolong/package.nix
+++ b/pkgs/by-name/to/toolong/package.nix
@@ -30,6 +30,9 @@ python311Packages.buildPythonApplication {
   pythonImportsCheck = [ "toolong" ];
   doCheck = false; # no tests
 
+  # From https://github.com/Textualize/toolong/pull/63, also fixes https://github.com/NixOS/nixpkgs/issues/360671
+  patches = [ ./0001-log-view.patch ];
+
   passthru.tests.version = testers.testVersion {
     package = toolong;
     command = "${lib.getExe toolong} --version";