diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-14 20:12:49 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-14 20:15:26 +0200 |
| commit | 260761649bd857ea73eeb6cd21c7e6c9830d7215 (patch) | |
| tree | 317e4ccee67d75ddc5978018d2d21b2ac491fc87 /pkgs | |
| parent | da9869e5d2d19fafba32aadaaeea21b8a6dc0535 (diff) | |
| download | nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar.gz nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar.bz2 nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar.lz nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar.xz nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.tar.zst nixlib-260761649bd857ea73eeb6cd21c7e6c9830d7215.zip | |
ffmpeg_4, ffmpeg_full: 4.2 -> 4.2.1
Fixes #68561 CVE-2019-15942.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 45a4f48fd337..78d291e86fac 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -238,11 +238,11 @@ assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; stdenv.mkDerivation rec { pname = "ffmpeg-full"; - version = "4.2"; + version = "4.2.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; - sha256 = "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"; + sha256 = "1m5nkc61ihgcf0b2wabm0zyqa8sj3c0w8fi6kr879lb0kdzciiyf"; }; patches = [ ./prefer-libdav1d-over-libaom.patch ]; diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 670f51000a6b..a0b95cecaaba 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -5,8 +5,8 @@ }@args: callPackage ./generic.nix (args // rec { - version = branch; + version = "4.2.1"; branch = "4.2"; - sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; + sha256 = "090naa6rj46pzkgh03bf51hbqdz356qqckr2pw6pykc6ysiryak8"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) |