diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-06-03 14:25:21 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-06-04 10:37:59 +0200 |
commit | 77abe5e4641701f1b7213575ba93cca1ac60d309 (patch) | |
tree | a1619cd1b14f4dc7e987d52f27bf5baf1ee0a472 /pkgs | |
parent | 12f06b3cc3f57a18cb285fd2274292faa6eb038d (diff) | |
download | nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar.gz nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar.bz2 nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar.lz nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar.xz nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.tar.zst nixpkgs-77abe5e4641701f1b7213575ba93cca1ac60d309.zip |
libav: update 0.8.11 -> .12, 9.12 -> .13, introduce 10.1
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libav/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index a6b552613cc..b21f530478a 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -26,8 +26,9 @@ with { inherit (stdenv.lib) optional optionals; }; let result = { - libav_9 = libavFun "9.12" "1wm0nf12c1p138y54jh71mvbpikrpk43zc9m2qhpjm9pgnagizk0"; - libav_0_8 = libavFun "0.8.11" "0nhm0mzz2aj78sgmw9xf20a1mlgig78cv1nyhx4zrq7nvgqf8d2r"; + libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr"; + libav_9 = libavFun "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g"; + libav_10 = libavFun "10.1" "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5080ca81db2..27dc28348f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4928,9 +4928,9 @@ let libassuan2_1 = callPackage ../development/libraries/libassuan/git.nix { }; - libav = libav_9; + libav = libav_10; libav_all = callPackage ../development/libraries/libav { }; - inherit (libav_all) libav_9 libav_0_8; + inherit (libav_all) libav_0_8 libav_9 libav_10; libavc1394 = callPackage ../development/libraries/libavc1394 { }; |