From a04c3b2985e6ce764a6e35ee2bbbee4f32468c00 Mon Sep 17 00:00:00 2001 From: emaryn Date: Tue, 3 Jun 2025 01:13:34 +0800 Subject: [PATCH] auto-editor: 26.2.0 -> 28.0.0 Diff: https://github.com/WyattBlue/auto-editor/compare/refs/tags/26.2.0...refs/tags/28.0.0 Changelog: https://github.com/WyattBlue/auto-editor/releases/tag/28.0.0 --- pkgs/by-name/au/auto-editor/package.nix | 22 +++++-------------- .../au/auto-editor/set-exe-paths.patch | 13 ----------- 2 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 pkgs/by-name/au/auto-editor/set-exe-paths.patch diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index d09d8245f12c..fe13efa7dcad 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -2,40 +2,30 @@ lib, python3Packages, fetchFromGitHub, - replaceVars, yt-dlp, }: python3Packages.buildPythonApplication rec { pname = "auto-editor"; - version = "26.2.0"; + version = "28.0.0"; pyproject = true; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-BYpt/EelCChhphfuTcqI/VIVis6dnt0J4FcNhWeiiyY="; + hash = "sha256-9U3hDVtSuOdiGnEsKs0InV9v0UrlI3qKaBqfCtVTD0E="; }; - patches = [ - (replaceVars ./set-exe-paths.patch { - yt_dlp = lib.getExe yt-dlp; - }) - ]; - postPatch = '' - # pyav is a fork of av, but has since mostly been un-forked - substituteInPlace pyproject.toml \ - --replace-fail '"pyav==14.*"' '"av"' + substituteInPlace auto_editor/__main__.py \ + --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"' ''; - build-system = with python3Packages; [ - setuptools - ]; + build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ - av + basswood-av numpy ]; diff --git a/pkgs/by-name/au/auto-editor/set-exe-paths.patch b/pkgs/by-name/au/auto-editor/set-exe-paths.patch deleted file mode 100644 index 97266aab9ef2..000000000000 --- a/pkgs/by-name/au/auto-editor/set-exe-paths.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py -index 931cc33..b0aecbc 100644 ---- a/auto_editor/utils/types.py -+++ b/auto_editor/utils/types.py -@@ -191,7 +191,7 @@ def resolution(val: str | None) -> tuple[int, int] | None: - - @dataclass(slots=True) - class Args: -- yt_dlp_location: str = "yt-dlp" -+ yt_dlp_location: str = "@yt_dlp@" - download_format: str | None = None - output_format: str | None = None - yt_dlp_extras: str | None = None