auto-editor: 26.2.0 -> 28.0.0 (#413298)

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
   ];
 

pkgs/by-name/au/auto-editor/set-exe-paths.patch

@@ -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

pkgs/development/python-modules/basswood-av/default.nix

@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pkg-config,
+  cython,
+  ffmpeg,
+}:
+
+let
+  cython' = cython.overrideAttrs (oldAttrs: rec {
+    version = "3.1.0";
+    src = oldAttrs.src.override {
+      tag = version;
+      hash = "sha256-3/C0+ygGgNvw75ZN02Q70TLFa1U4jVgWQDG5FGWErTg=";
+    };
+  });
+in
+buildPythonPackage rec {
+  pname = "basswood-av";
+  version = "15.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "basswood-io";
+    repo = "BasswoodAV";
+    tag = version;
+    hash = "sha256-GWNMPiNk8nSSm45EaRm1Te0PpCNPSYf62WbPYFY/9H8=";
+  };
+
+  build-system = [
+    setuptools
+    cython'
+  ];
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ ffmpeg ];
+
+  pythonImportsCheck = [ "bv" ];
+
+  meta = {
+    description = "Python bindings for ffmpeg libraries";
+    homepage = "https://github.com/basswood-io/BasswoodAV";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ emaryn ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -1680,6 +1680,8 @@ self: super: with self; {
 
   basiciw = callPackage ../development/python-modules/basiciw { };
 
+  basswood-av = callPackage ../development/python-modules/basswood-av { };
+
   batchgenerators = callPackage ../development/python-modules/batchgenerators { };
 
   batchspawner = callPackage ../development/python-modules/batchspawner { };