diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2015-07-08 17:03:49 -0700 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2015-07-08 17:03:49 -0700 |
| commit | 1fdd432ffabfc81ec7395ebeb0c3d18e96221804 (patch) | |
| tree | f88a0358eb327f52dfd27a78cb06959c77a1fa12 | |
| parent | 22bc910c1a307ddf488416be79bf013534df1ad0 (diff) | |
| download | nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar.gz nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar.bz2 nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar.lz nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar.xz nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.tar.zst nixpkgs-1fdd432ffabfc81ec7395ebeb0c3d18e96221804.zip | |
ffmpeg: 2.6.3 -> 2.7.1
| -rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/2.7.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 7d108ba81ef..555576d3a36 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.3"; + version = "2.7.1"; src = fetchurl { url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr"; + sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; }; patchPhase = ''patchShebangs .''; diff --git a/pkgs/development/libraries/ffmpeg/2.7.nix b/pkgs/development/libraries/ffmpeg/2.7.nix new file mode 100644 index 00000000000..3e4708fdf46 --- /dev/null +++ b/pkgs/development/libraries/ffmpeg/2.7.nix @@ -0,0 +1,7 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "${branch}.1"; + branch = "2.7"; + sha256 = "087pyx1wxvniq3wgj6z80wrb7ampwwsmwndmr7lymzhm4iyvj1vy"; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4dbd291e304..4efafc67348 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |