diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 907a586f8dfd..58f6f3de9831 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -332,6 +332,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/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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3094eed78f4..bbcbc392c4c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21414,9 +21414,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 { };