From 304484a753b3f8024876ae02958e97569703cd93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 16 Dec 2014 21:31:29 +0100 Subject: [PATCH] ffmpeg_2_3: use 2.2 instead of 2.3 2.3 branch is unmaintained and was critically vulnerable (I thank to monitor). --- pkgs/development/libraries/ffmpeg/{2.3.x.nix => 2.2.x.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/ffmpeg/{2.3.x.nix => 2.2.x.nix} (98%) diff --git a/pkgs/development/libraries/ffmpeg/2.3.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix similarity index 98% rename from pkgs/development/libraries/ffmpeg/2.3.x.nix rename to pkgs/development/libraries/ffmpeg/2.2.x.nix index 2b4b0569b552..51a6bb8c880c 100644 --- a/pkgs/development/libraries/ffmpeg/2.3.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.2.11"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v"; + sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c7813320b14d..73108c157c02 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5135,7 +5135,7 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { }; ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; @@ -11097,7 +11097,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2_3; + ffmpeg = ffmpeg_2_2; }; vmpk = callPackage ../applications/audio/vmpk { };