Unverified Commit 583ffe89 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Merge #251494: ffmpeg: ffmpeg_5 → ffmpeg_6 

...into staging
parents ac293236 a87f6a00

nixos/doc/manual/release-notes/rl-2311.section.md

+1 −0
Original line number Diff line number Diff line
@@ -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}

pkgs/applications/networking/remote/freerdp/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/top-level/all-packages.nix

+3 −3
Original line number Diff line number Diff line
@@ -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 { };