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

Merge pull request #14107 from nckx/drop-libav_9

Browse Source 
libav: drop unused version 9.
This commit is contained in:
Domen Kožar 2016-03-23 12:54:47 +00:00
commit d1c9f20db1
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,6 @@ with { inherit (stdenv.lib) optional optionals; };
let let
result = { result = {
libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714"; libav_0_8 = libavFun "0.8.17" "31ace2daeb8c105deed9cd3476df47318d417714";
libav_9 = libavFun "9.18" "e10cde4587c4d4d3bb11d30c7b47e953664cd714";
libav_11 = libavFun "11.6" "2296cbd7afe98591eb164cebe436dcb5582efc9d"; libav_11 = libavFun "11.6" "2296cbd7afe98591eb164cebe436dcb5582efc9d";
}; };

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

@ -7339,7 +7339,7 @@ let
libav = libav_11; # branch 11 is API-compatible with branch 10 libav = libav_11; # branch 11 is API-compatible with branch 10
libav_all = callPackage ../development/libraries/libav { }; libav_all = callPackage ../development/libraries/libav { };
inherit (libav_all) libav_0_8 libav_9 libav_11; inherit (libav_all) libav_0_8 libav_11;
libavc1394 = callPackage ../development/libraries/libavc1394 { }; libavc1394 = callPackage ../development/libraries/libavc1394 { };