From eea346f6cc1e131db912723d1ed40bd09828b46f Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Mon, 21 Apr 2025 18:18:27 +0100 Subject: [PATCH] isponsorblocktv: fix We're using different versions of dependencies, and the package is a major version behind on textual (a TUI library - nonessential, just used for the setup TUI; there's a setup text interface which works fine), and pyytlounge (essential, because this wraps the YT API used). This provides two temporary fixes that work around the problems. The textual patch can be upstreamed; the pyytlounge patch probably won't be since I think a more robust approach will be forthcoming from the iSponsorBlockTV author. --- pkgs/by-name/is/isponsorblocktv/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix index c684e58c1748..dd5651d38efd 100644 --- a/pkgs/by-name/is/isponsorblocktv/package.nix +++ b/pkgs/by-name/is/isponsorblocktv/package.nix @@ -1,5 +1,6 @@ { fetchFromGitHub, + fetchpatch, lib, python3Packages, }: @@ -16,6 +17,20 @@ python3Packages.buildPythonApplication rec { hash = "sha256-/lUs4EuifHKKyA8QiLsbqz0h6mxJpsFMjovpYE8+SxY="; }; + patches = [ + # Port iSponsorBlockTV to pyytlounge v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89b7b1c029cfbe3b5a481647cdd2d03dec5259ce.patch"; + hash = "sha256-ISMrNrfPTnEbb0lZbREf+kAniJopWx3FePMGFm4ycJY="; + }) + + # Update setup_wizard for Textual v3 + (fetchpatch { + url = "https://github.com/lukegb/iSponsorBlockTV/commit/89dd1d65335689c73a78509689396888599bbe58.patch"; + hash = "sha256-hhWXcqNK3b3mXLCK7W0eXNWgP4lPSl6qgB59Fx8+yeA="; + }) + ]; + build-system = with python3Packages; [ hatchling hatch-requirements-txt