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

ffmpeg_4, ffmpeg_full: 4.2 -> 4.2.1

Browse Source 
Fixes #68561 CVE-2019-15942.
This commit is contained in:
Vladimír Čunát 2019-09-14 20:12:49 +02:00
parent da9869e5d2
commit 260761649b
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View File

@ -238,11 +238,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "ffmpeg-full"; pname = "ffmpeg-full";
version = "4.2"; version = "4.2.1";
src = fetchurl { src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"; sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf";
}; };
patches = [ ./prefer-libdav1d-over-libaom.patch ]; patches = [ ./prefer-libdav1d-over-libaom.patch ];

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

@ -5,8 +5,8 @@
}@args: }@args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = branch; version = "4.2.1";
branch = "4.2"; branch = "4.2";
sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8";
darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ];
}) })