mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity

ffmpeg: 2.6.3 -> 2.7.1

Browse source
This commit is contained in:
Andrew Kelley 2015-07-08 17:03:49 -07:00
parent 22bc910c1a
commit 1fdd432ffa
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
stdenv.mkDerivation rec {
name = "ffmpeg-${version}";
version = "2.6.3";
version = "2.7.1";
src = fetchurl {
url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
};
patchPhase = ''patchShebangs .'';

7
pkgs/development/libraries/ffmpeg/2.7.nix Normal file
View file

@ -0,0 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.1";
branch = "2.7";
sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy";
})

3
pkgs/top-level/all-packages.nix
View file

@ -6111,10 +6111,11 @@ let
ffmpeg_1_2 = import ../development/libraries/ffmpeg/1.2.nix { inherit callPackage; };
ffmpeg_2_2 = import ../development/libraries/ffmpeg/2.2.nix { inherit callPackage; };
ffmpeg_2_6 = import ../development/libraries/ffmpeg/2.6.nix { inherit callPackage; };
ffmpeg_2_7 = import ../development/libraries/ffmpeg/2.7.nix { inherit callPackage; };
# Aliases
ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_6;
ffmpeg_2 = ffmpeg_2_7;
ffmpeg = ffmpeg_2;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {