mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-18 07:46:09 +01:00
ffmpeg: update branches
ffmpeg_0_10: 0.10.15 -> 0.10.16 ffmpeg_2_2: 2.2.13 -> 2.2.15 ffmpeg_2_6: 2.6.1 -> 2.6.2 ffmpeg-full: 2.6.1 -> 2.6.2
This commit is contained in:
parent
82b74ae425
commit
a35ef4e3df
4 changed files with 8 additions and 8 deletions
|
@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-${version}";
|
||||
version = "2.6.1";
|
||||
version = "2.6.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
|
||||
sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
|
||||
sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
|
||||
};
|
||||
|
||||
patchPhase = ''patchShebangs .'';
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.15";
|
||||
version = "${branch}.16";
|
||||
branch = "0.10";
|
||||
sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb";
|
||||
sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77";
|
||||
})
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.13";
|
||||
version = "${branch}.15";
|
||||
branch = "2.2";
|
||||
sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0";
|
||||
sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4";
|
||||
})
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}.1";
|
||||
version = "${branch}.2";
|
||||
branch = "2.6";
|
||||
sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4";
|
||||
sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8";
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue