Merge 'staging' into master

This commit is contained in:
Vladimír Čunát
2014-08-08 20:13:23 +02:00
220 changed files with 611 additions and 2164 deletions
+1 -1
View File
@@ -28,7 +28,7 @@ let
result = {
libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
libav_9 = libavFun "9.14" "07gn4lbqx6wfhb2h2ddj88hcsacwmzb4syalg211m55xmp1g1fp4";
libav_10 = libavFun "10.2" "06wvk51cnllw6367qagc90sva4jr5d0r6jx8183wcwzwzgv01w29";
libav_10 = libavFun "10.3" "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r";
};
libavFun = version : sha256 : stdenv.mkDerivation rec {