summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2018-07-15 11:03:42 +0200
committerVladimír Čunát <vcunat@gmail.com>2018-07-15 11:07:03 +0200
commit03e13ab3706d49f2f94d826abee9c5badc66a68e (patch)
tree397a3edf591b8e1ea40f6d1a0ef7e60ea9c63e80 /pkgs/development
parent10cbebe3dfc2ef92cc363eb51abd6ecb8a05edab (diff)
downloadnixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar.gz
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar.bz2
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar.lz
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar.xz
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.tar.zst
nixlib-03e13ab3706d49f2f94d826abee9c5badc66a68e.zip
ffmpeg_4, ffmpeg-full: 4.0 -> 4.0.1 (security)
https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/e049f7c24f:/Changelog
http://ffmpeg.org/security.html claims it fixes CVE-2018-12458..12460
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/ffmpeg-full/default.nix4
-rw-r--r--pkgs/development/libraries/ffmpeg/4.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 fcbaaaba6ba4..c5ce5e252fac 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -232,11 +232,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
 
 stdenv.mkDerivation rec {
   name = "ffmpeg-full-${version}";
-  version = "4.0";
+  version = "4.0.1";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
-    sha256 = "0gx4ngnhi5glmxh38603qy5n6vq8bl1cr4sqd1xff95i82pmv57d";
+    sha256 = "1vn04n0n46zdxq14cma3w8ml2ckh5jxwlybsc4xmvcqdqq0mqpv0";
   };
 
   prePatch = ''
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix
index a6e67052cd03..40b697c7a76a 100644
--- a/pkgs/development/libraries/ffmpeg/4.nix
+++ b/pkgs/development/libraries/ffmpeg/4.nix
@@ -6,7 +6,7 @@
 
 callPackage ./generic.nix (args // rec {
   version = "${branch}";
-  branch = "4.0";
-  sha256 = "1f3k8nz5ag6szsfhlrz66qm8s1yxk1vphqvcfr4ps4690vckk2ii";
+  branch = "4.0.1";
+  sha256 = "0w0nq98sn5jwx982wzg3vfrxv4p0k1fvsksiz9az0rpvwyqr3rby";
   darwinFrameworks = [ Cocoa CoreMedia ];
 })