Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

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

codyopel a35ef4e3 82b74ae4

+8 -8
+2 -2
pkgs/development/libraries/ffmpeg-full/default.nix
··· 231 231 232 232 stdenv.mkDerivation rec { 233 233 name = "ffmpeg-${version}"; 234 - version = "2.6.1"; 234 + version = "2.6.2"; 235 235 236 236 src = fetchurl { 237 237 url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; 238 - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; 238 + sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; 239 239 }; 240 240 241 241 patchPhase = ''patchShebangs .'';
+2 -2
pkgs/development/libraries/ffmpeg/0.10.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // rec { 4 - version = "${branch}.15"; 4 + version = "${branch}.16"; 5 5 branch = "0.10"; 6 - sha256 = "0p9x559fpj4zxll7rn3kwdig6y66c3ahv3pddmz23lljq5rvyvcb"; 6 + sha256 = "1l9z5yfp1vq4z2y4mh91707dhcn41c3pd505i0gvdzcdsp5j6y77"; 7 7 })
+2 -2
pkgs/development/libraries/ffmpeg/2.2.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // rec { 4 - version = "${branch}.13"; 4 + version = "${branch}.15"; 5 5 branch = "2.2"; 6 - sha256 = "1vva8ffwxi3rg44byy09qlbiqrrd1h4rmsl5b1mbmvzvwl1lq1l0"; 6 + sha256 = "1s2mf1lvvwj6vkbp0wdr21xki864xsfi1rsjaa67q5m9dx4rrnr4"; 7 7 })
+2 -2
pkgs/development/libraries/ffmpeg/2.6.nix
··· 1 1 { callPackage, ... } @ args: 2 2 3 3 callPackage ./generic.nix (args // rec { 4 - version = "${branch}.1"; 4 + version = "${branch}.2"; 5 5 branch = "2.6"; 6 - sha256 = "1hf77va46r8s05g5a5m7xx8b9vjzmqca0ajxsflsnbgf0s3kixm4"; 6 + sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; 7 7 })