public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: 3.3.4 -> 3.4 

ffmpeg_3 bumped to 3.4, and 3.3.4 removed from the tree
This commit is contained in:
Cray Elliott 2017-10-23 23:23:23 -07:00
parent cccee1ddb7
commit 5ddea062e2
3 changed files with 6 additions and 6 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 nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-full-${version}"; name = "ffmpeg-full-${version}";
version = "3.3.4"; version = "3.4";
src = fetchurl { src = fetchurl {
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"; url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
sha256 = "0mx9dvad3lkyhvsrblf280x2bz6dxajya1ylnspbdzldj0dpxfcq"; sha256 = "1vzvpx8ixy8m44f8qwp833hv253hpghybgzbc4n8b3div3j0dvmf";
}; };
patchPhase = ''patchShebangs . patchPhase = ''patchShebangs .

4
pkgs/development/libraries/ffmpeg/3.3.nix → pkgs/development/libraries/ffmpeg/3.4.nix
View File

@ -6,7 +6,7 @@
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}"; version = "${branch}";
branch = "3.3.4"; branch = "3.4";
sha256 = "0zmczggi95fbsq9nz33mpln1y3p1gqniqc4x5smp871idhkykxay"; sha256 = "0pn8g3ab937ahslqd41crk0g4j4fh7kwimsrlfc0rl0pc3z132ax";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
}) })

4
pkgs/top-level/all-packages.nix
View File

@ -8098,14 +8098,14 @@ with pkgs;
ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
ffmpeg_3_3 = callPackage ../development/libraries/ffmpeg/3.3.nix { ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
}; };
# Aliases # Aliases
ffmpeg_0 = ffmpeg_0_10; ffmpeg_0 = ffmpeg_0_10;
ffmpeg_1 = ffmpeg_1_2; ffmpeg_1 = ffmpeg_1_2;
ffmpeg_2 = ffmpeg_2_8; ffmpeg_2 = ffmpeg_2_8;
ffmpeg_3 = ffmpeg_3_3; ffmpeg_3 = ffmpeg_3_4;
ffmpeg = ffmpeg_3; ffmpeg = ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {