diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix index 2ed625e7ebaa..0806802a5940 100644 --- a/pkgs/by-name/is/isponsorblocktv/package.nix +++ b/pkgs/by-name/is/isponsorblocktv/package.nix @@ -1 +1,49 @@ -{ python3Packages }: python3Packages.callPackage ./pypackage.nix { } +{ + fetchFromGitHub, + lib, + python3Packages, +}: + +python3Packages.buildPythonApplication rec { + pname = "isponsorblocktv"; + version = "2.3.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "dmunozv04"; + repo = "iSponsorBlockTV"; + tag = "v${version}"; + hash = "sha256-4HGhPUnors7T2UVZCLVIcGX63SRU3PZ1JQ+zf2ZV8/M="; + }; + + build-system = with python3Packages; [ + hatchling + hatch-requirements-txt + ]; + + dependencies = with python3Packages; [ + aiohttp + appdirs + async-cache + pyytlounge + rich-click + rich + ssdp + textual-slider + textual + xmltodict + ]; + + # all dependencies are pinned to exact version numbers + pythonRelaxDeps = true; + + meta = { + homepage = "https://github.com/dmunozv04/iSponsorBlockTV"; + changelog = "https://github.com/dmunozv04/iSponsorBlockTV/releases/tag/${src.tag}"; + description = "SponsorBlock client for all YouTube TV clients"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ lukegb ]; + mainProgram = "iSponsorBlockTV"; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/is/isponsorblocktv/pypackage.nix b/pkgs/by-name/is/isponsorblocktv/pypackage.nix deleted file mode 100644 index 788f52221b63..000000000000 --- a/pkgs/by-name/is/isponsorblocktv/pypackage.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - buildPythonApplication, - fetchFromGitHub, - lib, - hatchling, - hatch-requirements-txt, - aiohttp, - appdirs, - async-cache, - pyytlounge, - rich-click, - rich, - ssdp, - textual-slider, - textual, - xmltodict, - pythonRelaxDepsHook, -}: -buildPythonApplication rec { - pname = "iSponsorBlockTV"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "dmunozv04"; - repo = "iSponsorBlockTV"; - rev = "v${version}"; - hash = "sha256-v5NF6o+9IxusYNebs2a9fgHCHZNN9hHLQurujhmdsgU="; - }; - - pyproject = true; - - build-system = [ - hatchling - hatch-requirements-txt - ]; - - dependencies = [ - aiohttp - appdirs - async-cache - pyytlounge - rich-click - rich - ssdp - textual-slider - textual - xmltodict - ]; - - nativeBuildInputs = [ pythonRelaxDepsHook ]; - - pythonRemoveDeps = [ "argparse" ]; - - pythonRelaxDeps = [ - "aiohttp" - "pyytlounge" - "textual-slider" - "textual" - "rich" - ]; - - meta = { - homepage = "https://github.com/dmunozv04/iSponsorBlockTV"; - description = "SponsorBlock client for all YouTube TV clients"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ lukegb ]; - mainProgram = "iSponsorBlockTV"; - platforms = lib.platforms.linux; - }; -}