From 61fa78293dece8d75957782f6006f0266a62ed01 Mon Sep 17 00:00:00 2001
From: codyopel <codyopel@gmail.com>
Date: Wed, 20 May 2015 20:45:59 -0400
Subject: [PATCH] ffmpeg(-full): 2.6.2 -> 2.6.3
---
pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
pkgs/development/libraries/ffmpeg/2.6.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 137340663402..fd5ca0545a3b 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
stdenv.mkDerivation rec {
name = "ffmpeg-${version}";
- version = "2.6.2";
+ version = "2.6.3";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
- sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
+ sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
};
patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix
index 0974af75ccd5..60fc32e030e0 100644
--- a/pkgs/development/libraries/ffmpeg/2.6.nix
+++ b/pkgs/development/libraries/ffmpeg/2.6.nix
@@ -1,7 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
- version = "${branch}.2";
+ version = "${branch}.3";
branch = "2.6";
- sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
+ sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
})