colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #251494: ffmpeg: ffmpeg_5 → ffmpeg_6

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát 2023-09-27 00:15:14 +02:00
commit 583ffe89e5
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 - `keepTerminfo` controls whether `TERMINFO` and `TERMINFO_DIRS` are preserved
for `root` and the `wheel` group. for `root` and the `wheel` group.
- `ffmpeg` default upgraded from `ffmpeg_5` to `ffmpeg_6`.
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}

4
pkgs/applications/networking/remote/freerdp/default.nix
View File

@ -8,7 +8,7 @@
, alsa-lib , alsa-lib
, faac , faac
, faad2 , faad2
, ffmpeg , ffmpeg_5 # Depends on deprecated libav features
, glib , glib
, openh264 , openh264
, openssl , openssl
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
cairo cairo
cups cups
faad2 faad2
ffmpeg ffmpeg_5
glib glib
gst-plugins-base gst-plugins-base
gst-plugins-good gst-plugins-good

6
pkgs/top-level/all-packages.nix
View File

@ -21414,9 +21414,9 @@ with pkgs;
# update to ffmpeg # update to ffmpeg
# Packages which use ffmpeg as a library, should pin to the relevant major # Packages which use ffmpeg as a library, should pin to the relevant major
# version number which the upstream support. # version number which the upstream support.
ffmpeg = ffmpeg_5; ffmpeg = ffmpeg_6;
ffmpeg-headless = ffmpeg_5-headless; ffmpeg-headless = ffmpeg_6-headless;
ffmpeg-full = ffmpeg_5-full; ffmpeg-full = ffmpeg_6-full;
ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { }; ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };