From fb1e994c0c48054ad1b78149ed07d33c4254f6eb Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Wed, 14 Oct 2015 22:39:30 -0700
Subject: [PATCH] ffmpeg: 2.7.2 -> 2.8.1 (close #10396)

@vcunat removed 2.7 and 2.6. The global version of 2.6 was unused,
and 2.7 -> 2.8 switch should be without problems by inspecting
http://abi-laboratory.pro/tracker/timeline/ffmpeg/
(only ABI changes and symbol additions)
---
 pkgs/development/libraries/ffmpeg-full/default.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/2.6.nix          | 7 -------
 pkgs/development/libraries/ffmpeg/2.7.nix          | 7 -------
 pkgs/development/libraries/ffmpeg/2.8.nix          | 7 +++++++
 pkgs/top-level/all-packages.nix                    | 5 ++---
 5 files changed, 11 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/development/libraries/ffmpeg/2.6.nix
 delete mode 100644 pkgs/development/libraries/ffmpeg/2.7.nix
 create mode 100644 pkgs/development/libraries/ffmpeg/2.8.nix

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 654741283f95..cecf4714b532 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-full-${version}";
-  version = "2.7.2";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.bz2";
-    sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
+    sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
   };
 
   patchPhase = ''patchShebangs .'';
diff --git a/pkgs/development/libraries/ffmpeg/2.6.nix b/pkgs/development/libraries/ffmpeg/2.6.nix
deleted file mode 100644
index 60fc32e030e0..000000000000
--- a/pkgs/development/libraries/ffmpeg/2.6.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.3";
-  branch = "2.6";
-  sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
-})
diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix
deleted file mode 100644
index 105239c48c9c..000000000000
--- a/pkgs/development/libraries/ffmpeg/2.7.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "${branch}.2";
-  branch = "2.7";
-  sha256 = "1wlygd0jp34dk4qagi4h9psn4yk8zgyj7zy9lrpm5332mm87bsvw";
-})
diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
new file mode 100644
index 000000000000..e585ea14997f
--- /dev/null
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -0,0 +1,7 @@
+{ callPackage, ... } @ args:
+
+callPackage ./generic.nix (args // rec {
+  version = "${branch}.1";
+  branch = "2.8";
+  sha256 = "1qk6g2h993i0wgs9d2p3ahdc5bqr03mp74bk6r1zj6pfinr5mvg2";
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49a8259e7648..9f4dd230163b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6158,12 +6158,11 @@ let
   ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { };
   ffmpeg_1_2 = callPackage ../development/libraries/ffmpeg/1.2.nix { };
   ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.nix { };
-  ffmpeg_2_6 = callPackage ../development/libraries/ffmpeg/2.6.nix { };
-  ffmpeg_2_7 = callPackage ../development/libraries/ffmpeg/2.7.nix { };
+  ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { };
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;
-  ffmpeg_2 = ffmpeg_2_7;
+  ffmpeg_2 = ffmpeg_2_8;
   ffmpeg = ffmpeg_2;
 
   ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {