From 25088d49601adce395b6f9defe63b06706f8136d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 25 Aug 2023 00:25:59 -0600 Subject: [PATCH 1/2] =?UTF-8?q?ffmpeg:=20ffmpeg=5F5=20=E2=86=92=20ffmpeg?= =?UTF-8?q?=5F6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nixos/doc/manual/release-notes/rl-2311.section.md | 1 + pkgs/top-level/all-packages.nix | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 7b3a17e546f2..5e81c231f40f 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -316,6 +316,7 @@ The module update takes care of the new config syntax and the data itself (user - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved for `root` and the `wheel` group. +- `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`. ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e08ae8d19e2..ab975a96f499 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21409,9 +21409,9 @@ with pkgs; # update to ffmpeg # Packages which use ffmpeg as a library, should pin to the relevant major # version number which the upstream support. - ffmpeg = ffmpeg_5; - ffmpeg-headless = ffmpeg_5-headless; - ffmpeg-full = ffmpeg_5-full; + ffmpeg = ffmpeg_6; + ffmpeg-headless = ffmpeg_6-headless; + ffmpeg-full = ffmpeg_6-full; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; From a87f6a0054ae73efb98dc0f46f29090ce1f46aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Sun, 24 Sep 2023 10:17:58 -0600 Subject: [PATCH 2/2] =?UTF-8?q?freerdp:=20ffmpeg=20=E2=86=92=20ffmpeg=5F5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Atemu --- pkgs/applications/networking/remote/freerdp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index 701b266b7309..072e1482193b 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -8,7 +8,7 @@ , alsa-lib , faac , faad2 -, ffmpeg +, ffmpeg_5 # Depends on deprecated libav features , glib , openh264 , openssl @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { cairo cups faad2 - ffmpeg + ffmpeg_5 glib gst-plugins-base gst-plugins-good