Skip to content

Commit

Permalink
libav: update 0.8.11 -> .12, 9.12 -> .13, introduce 10.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@vcunat
vcunat committed Jun 4, 2014
1 parent 12f06b3 commit 77abe5e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 3 additions & 2 deletions pkgs/development/libraries/libav/default.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };

Expand Down

4 comments on commit 77abe5e

@lucabrunox
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This probably broke http://hydra.nixos.org/job/nixos/trunk-combined/nixpkgs.gst_all_1.gst-libav.x86_64-linux

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 77abe5e Jun 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I'll have a look at it, hopefully tomorrow. I didn't expect such a thing from a maintenance update.

@7c6f434c
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think using libav_9 version for gstreamer fixed the problem.

@vcunat
Copy link
Member Author

@vcunat vcunat commented on 77abe5e Jun 8, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that didn't occur to me. Thanks.

Please sign in to comment.