diff options
author | Andrew Kelley <superjoe30@gmail.com> | 2015-10-14 22:39:30 -0700 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-15 21:07:00 +0200 |
commit | fb1e994c0c48054ad1b78149ed07d33c4254f6eb (patch) | |
tree | fee7aaf54ae9637d63b0b36b531f66a7b70a1aa0 /pkgs/development | |
parent | f4fb1d77538a4d4d75046b9ae7a98b97c6220bc8 (diff) | |
download | nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar.gz nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar.bz2 nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar.lz nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar.xz nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.tar.zst nixpkgs-fb1e994c0c48054ad1b78149ed07d33c4254f6eb.zip |
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)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/ffmpeg-full/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/2.6.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/2.7.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/ffmpeg/2.8.nix | 7 |
4 files changed, 9 insertions, 16 deletions
diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 654741283f9..cecf4714b53 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 60fc32e030e..00000000000 --- 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 105239c48c9..00000000000 --- 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 00000000000..e585ea14997 --- /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"; +}) |