From c0fe794bff594f35b968a998091638bba641c5db Mon Sep 17 00:00:00 2001 From: Atemu Date: Fri, 5 Apr 2024 16:18:13 +0200 Subject: [PATCH] ffmpeg_7: init at 7.0 --- pkgs/development/libraries/ffmpeg/default.nix | 9 +++++++++ pkgs/top-level/all-packages.nix | 3 +++ 2 files changed, 12 insertions(+) diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index 5c15239541d8..65e12e6b3672 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -33,6 +33,11 @@ let version = "6.1.1"; hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo="; }; + + v7 = { + version = "7.0"; + hash = "sha256-RdDfv+0y90XpgjIRvTjsemKyGunzDbsh4j4WiE9rfyM="; + }; in rec { @@ -48,6 +53,10 @@ rec { ffmpeg_6-headless = mkFFmpeg v6 "headless"; ffmpeg_6-full = mkFFmpeg v6 "full"; + ffmpeg_7 = mkFFmpeg v7 "small"; + ffmpeg_7-headless = mkFFmpeg v7 "headless"; + ffmpeg_7-full = mkFFmpeg v7 "full"; + # Please make sure this is updated to the latest version on the next major # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c1fb55c5584c..59438e97fb48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20899,6 +20899,9 @@ with pkgs; ffmpeg_6 ffmpeg_6-headless ffmpeg_6-full + ffmpeg_7 + ffmpeg_7-headless + ffmpeg_7-full ffmpeg ffmpeg-headless ffmpeg-full;