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

ffmpeg_3: 3.0.2 -> 3.1.1

Browse Source
This commit is contained in:
Vladimír Čunát 2016-07-09 11:43:25 +02:00
parent 4e09623b6f
commit cd04b83605
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/ffmpeg/3.0.nix
View File

@ -1,7 +0,0 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.2";
branch = "3.0";
sha256 = "0dpx15001ha9p8h8vfg1lm9pggbc96kmb546hz88wdac5xycgqrh";
})

7
pkgs/development/libraries/ffmpeg/3.1.nix Normal file
View File

@ -0,0 +1,7 @@
{ callPackage, ... } @ args:
callPackage ./generic.nix (args // rec {
version = "${branch}.1";
branch = "3.1";
sha256 = "1d5knh87cgnla5zawy56gkrpb48qhyiq7i0pm8z9hyx3j05abg55";
})

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

@ -7059,14 +7059,14 @@ in
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_0 = callPackage ../development/libraries/ffmpeg/3.0.nix { ffmpeg_3_1 = callPackage ../development/libraries/ffmpeg/3.1.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa; inherit (darwin.apple_sdk.frameworks) Cocoa;
}; };
# Aliases # Aliases
ffmpeg_0 = self.ffmpeg_0_10; ffmpeg_0 = self.ffmpeg_0_10;
ffmpeg_1 = self.ffmpeg_1_2; ffmpeg_1 = self.ffmpeg_1_2;
ffmpeg_2 = self.ffmpeg_2_8; ffmpeg_2 = self.ffmpeg_2_8;
ffmpeg_3 = self.ffmpeg_3_0; ffmpeg_3 = self.ffmpeg_3_1;
ffmpeg = self.ffmpeg_3; ffmpeg = self.ffmpeg_3;
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {