summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-01-17 09:56:32 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-01-17 09:56:32 +0100
commit85628148de308b96744986f44ef0d05807125082 (patch)
tree7d19378d3eced0aa54ad6c3f88c3fb342f53c658 /pkgs/development
parent2d0893088fff99e1c0c438ba7b4c42ac6769af75 (diff)
downloadnixlib-85628148de308b96744986f44ef0d05807125082.tar
nixlib-85628148de308b96744986f44ef0d05807125082.tar.gz
nixlib-85628148de308b96744986f44ef0d05807125082.tar.bz2
nixlib-85628148de308b96744986f44ef0d05807125082.tar.lz
nixlib-85628148de308b96744986f44ef0d05807125082.tar.xz
nixlib-85628148de308b96744986f44ef0d05807125082.tar.zst
nixlib-85628148de308b96744986f44ef0d05807125082.zip
ffmpeg(-2.8): security update to fix #12437
2.8.5 is claimed to fix CVE-2016-{1897,1898}.
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix4
-rw-r--r--pkgs/development/libraries/ffmpeg/2.8.nix4
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 fadb3feb4cc0..eed6a3bc763c 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -235,11 +235,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "2.8.1";
+  version = "2.8.5";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
-    sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
+    sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index e585ea14997f..2f911b26ca19 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.1";
+  version = "${branch}.5";
   branch = "2.8";
-  sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
+  sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
 })