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

libav: replace default 10 branch by the new 11

Browse Source 
Upstream claims the upgrade is API-compatible.
That is why I decided to drop the 10 branch completely.
This commit is contained in:
Vladimír Čunát 2014-09-13 21:43:12 +02:00
parent e90e423a26
commit 6a63d1e1e1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/libraries/libav/default.nix
View File

@ -28,7 +28,7 @@ let
result = {
libav_0_8 = libavFun "0.8.16" "df88b8f7d04d47edea8b19d80814227f0c058e57";
libav_9 = libavFun "9.17" "5899d51947b62f6b0cf9795ec2330d5ed59a3273";
libav_10 = libavFun "10.5" "925a45d2700a436c28e0b663510fc8df5bb7e861";
libav_11 = libavFun "11" "21f3c7c2154c0ad703872f2faa65ef20d6b7a14f";
};
libavFun = version : sha1 : stdenv.mkDerivation rec {

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

@ -4894,7 +4894,7 @@ let
gperftools = callPackage ../development/libraries/gperftools { };
gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
callPackage = pkgs.newScope (pkgs // { libav = pkgs.libav_10; });
callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; });
});
gst_all = {
@ -5194,9 +5194,9 @@ let
libatomic_ops = callPackage ../development/libraries/libatomic_ops {};
libav = libav_10;
libav = libav_11; # branch 11 is API-compatible with branch 10
libav_all = callPackage ../development/libraries/libav { };
inherit (libav_all) libav_0_8 libav_9 libav_10;
inherit (libav_all) libav_0_8 libav_9 libav_11;
libavc1394 = callPackage ../development/libraries/libavc1394 { };