diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
| commit | 8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (patch) | |
| tree | 0fbbc6b2a4103f52619d0df114015d79b1bb9f49 /pkgs/development/libraries/libav | |
| parent | 4c3e6a46754f32c059484b25e35925a92a7c9574 (diff) | |
| parent | acba6b4da25e4b92e2422036104ad2040bef1acd (diff) | |
| download | nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.gz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.bz2 nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.lz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.xz nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.zst nixpkgs-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.zip | |
Merge branch 'staging' into v/modular
Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
Diffstat (limited to 'pkgs/development/libraries/libav')
| -rw-r--r-- | pkgs/development/libraries/libav/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix index 2268290b9f7..0cbda2e1405 100644 --- a/pkgs/development/libraries/libav/default.nix +++ b/pkgs/development/libraries/libav/default.nix @@ -28,7 +28,7 @@ let result = { libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685"; libav_9 = libavFun "9.16" "18378gdgzqsxaacc9vl7ligwndbdvy95wbn50hs8xvdqn1rn916a"; - libav_10 = libavFun "10.3" "1fq83rc5534fjqjlhkw5i9k54dmyqn2pgvyillm6pws8rkn9yb5r"; + libav_10 = libavFun "10.4" "1zzvjfdlv9swhq7dzvli1pk8cn02q1076ax9m3cx9ipilbg21639"; }; libavFun = version : sha256 : stdenv.mkDerivation rec { |