Skip to content

Commit 20b2fab

Browse files
authored
auto-editor: 24w29a -> 26.2.0 (#385626)
2 parents 0905e3b + 6bb93f9 commit 20b2fab

File tree

2 files changed

+6
-30
lines changed

2 files changed

+6
-30
lines changed

pkgs/by-name/au/auto-editor/package.nix

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,33 @@
33
python3Packages,
44
fetchFromGitHub,
55
replaceVars,
6-
ffmpeg,
76
yt-dlp,
87
}:
98

109
python3Packages.buildPythonApplication rec {
1110
pname = "auto-editor";
12-
version = "24w29a";
11+
version = "26.2.0";
1312
pyproject = true;
1413

1514
src = fetchFromGitHub {
1615
owner = "WyattBlue";
1716
repo = "auto-editor";
1817
tag = version;
19-
hash = "sha256-2/6IqwMlaWobOlDr/h2WV2OqkxqVmUI65XsyBphTbpA=";
18+
hash = "sha256-BYpt/EelCChhphfuTcqI/VIVis6dnt0J4FcNhWeiiyY=";
2019
};
2120

2221
patches = [
2322
(replaceVars ./set-exe-paths.patch {
24-
ffmpeg = lib.getExe ffmpeg;
2523
yt_dlp = lib.getExe yt-dlp;
2624
})
2725
];
2826

2927
postPatch = ''
3028
# pyav is a fork of av, but has since mostly been un-forked
3129
substituteInPlace pyproject.toml \
32-
--replace-fail '"pyav==12.2.*"' '"av"'
30+
--replace-fail '"pyav==14.*"' '"av"'
3331
'';
3432

35-
# our patch file also removes the dependency on ae-ffmpeg
36-
pythonRemoveDeps = [ "ae-ffmpeg" ];
37-
3833
build-system = with python3Packages; [
3934
setuptools
4035
];

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,10 @@
1-
diff --git a/auto_editor/ffwrapper.py b/auto_editor/ffwrapper.py
2-
index b6df2d4..8409032 100644
3-
--- a/auto_editor/ffwrapper.py
4-
+++ b/auto_editor/ffwrapper.py
5-
@@ -30,13 +30,7 @@ class FFmpeg:
6-
return ff_location
7-
if my_ffmpeg:
8-
return "ffmpeg"
9-
-
10-
- try:
11-
- import ae_ffmpeg
12-
-
13-
- return ae_ffmpeg.get_path()
14-
- except ImportError:
15-
- return "ffmpeg"
16-
+ return "@ffmpeg@"
17-
18-
self.debug = debug
19-
self.show_cmd = show_cmd
201
diff --git a/auto_editor/utils/types.py b/auto_editor/utils/types.py
21-
index ccd6581..a66e5e3 100644
2+
index 931cc33..b0aecbc 100644
223
--- a/auto_editor/utils/types.py
234
+++ b/auto_editor/utils/types.py
24-
@@ -218,7 +218,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
5+
@@ -191,7 +191,7 @@ def resolution(val: str | None) -> tuple[int, int] | None:
256

26-
@dataclass
7+
@dataclass(slots=True)
278
class Args:
289
- yt_dlp_location: str = "yt-dlp"
2910
+ yt_dlp_location: str = "@yt_dlp@"

0 commit comments

Comments
 (0)