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

Merge branch 'staging-next-21.05' into release-21.05

Browse Source
This commit is contained in:
Vladimír Čunát 2021-10-06 18:36:09 +02:00
commit e81d8c1fdc
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/ffmpeg/4.nix
View File

@ -23,6 +23,16 @@ callPackage ./generic.nix (rec {
url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch"; url = "https://github.com/FFmpeg/FFmpeg/commit/7150f9575671f898382c370acae35f9087a30ba1.patch";
sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i"; sha256 = "0gwkc7v1wsh4j0am2nnskhsca1b5aqzhcfd41sd9mh2swsdyf27i";
}) })
(fetchpatch {
name = "CVE-2021-38171.patch";
url = "https://github.com/FFmpeg/FFmpeg/commit/9ffa49496d1aae4cbbb387aac28a9e061a6ab0a6.patch";
sha256 = "0b8hsb45izw7w1vb2b94k9f6kvn2shxrap5ip1krdxg6hs7an0x8";
})
(fetchpatch {
name = "CVE-2021-38291.patch";
url = "https://github.com/FFmpeg/FFmpeg/commit/e01d306c647b5827102260b885faa223b646d2d1.patch";
sha256 = "0p2p8gcnb5j469xa3czfssm09w3jk08kz8rnl8wi2l9aj9l08my9";
})
# Fix incorrect segment length in HLS child playlist with fmp4 segment format # Fix incorrect segment length in HLS child playlist with fmp4 segment format
# FIXME remove in version 4.5 # FIXME remove in version 4.5
# https://trac.ffmpeg.org/ticket/9193 # https://trac.ffmpeg.org/ticket/9193

2
pkgs/development/libraries/qt-5/modules/qtbase.nix
View File

@ -94,6 +94,8 @@ stdenv.mkDerivation {
propagatedNativeBuildInputs = [ lndir ]; propagatedNativeBuildInputs = [ lndir ];
enableParallelBuilding = true;
outputs = [ "bin" "dev" "out" ]; outputs = [ "bin" "dev" "out" ];
inherit patches; inherit patches;