From 1a46368a60f128b7bd11a83a78f5b37857e0210f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 1 Apr 2017 13:40:40 +0200 Subject: [PATCH] ffmpeg(3): 3.1 -> 3.2 According to ABI report https://abi-laboratory.pro/tracker/timeline/ffmpeg/ I see only one removed function and one removed field - both should be detected during compile-time. The rest are changes that don't matter when everything rebuilds. --- pkgs/top-level/all-packages.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e403f303d12..f0047cc4426 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7372,7 +7372,7 @@ with pkgs; ffmpeg_0 = ffmpeg_0_10; ffmpeg_1 = ffmpeg_1_2; ffmpeg_2 = ffmpeg_2_8; - ffmpeg_3 = ffmpeg_3_1; + ffmpeg_3 = ffmpeg_3_2; ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { @@ -14424,10 +14424,7 @@ with pkgs; lxdvdrip = callPackage ../applications/video/lxdvdrip { }; - handbrake = callPackage ../applications/video/handbrake { - # TODO: remove when 3.2 becomes default - ffmpeg = ffmpeg_3_2; - }; + handbrake = callPackage ../applications/video/handbrake { }; lilyterm = callPackage ../applications/misc/lilyterm { inherit (gnome2) vte;