jdk7: update patchversion 51 -> 55.
Bump mpv to 0.3.8
Add subtitle option for ffmpeg.
Fix whitespace
s/config.allowUnfree = true/allowUnfree = true/
darktable: update from 1.4.1 to 1.4.2
Merge pull request #2388 from bennofs/update-jdk7

jdk7: update patchversion 51 -> 55.
haskell: bump ekg to 0.4, add ekg-core
aubio: update from 0.4.0 to 0.4.1
build-support/vm: add Ubuntu 14.04 Trusty Tahir

Signed-off-by: Austin Seipp <aseipp@pobox.com>
debian: Update to 7.5

[Note from Austin: I think @edolstra forgot to merge this to master.]

(cherry picked from commit 02b056c5b180b4b8ba22ddc3061d78258e2ef98f on
release-14.04)
Merge pull request #2483 from proger/haskell-ekg-0.4

haskell: bump ekg to 0.4, add ekg-core
ghc-head: update snapshot to 7.9.20140430 (and download the tarball from Debian)

https://github.com/NixOS/nixpkgs/pull/2480
Bootstrap ghc-head with GHC 7.6.3 to see if that solves our weird compiler errors:

  compiler/simplCore/CoreMonad.lhs:835:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `A.Alternative CoreM'

  compiler/simplCore/CoreMonad.lhs:841:10:
      Non type-variable argument in the constraint: MonadPlus IO
      (Use -XFlexibleContexts to permit this)
      In the context: (MonadPlus IO)
      While checking an instance declaration
      In the instance declaration for `MonadPlus CoreM'
haskell-xmonad-contrib: update to version 0.11.3
haskell-Hipmunk: update to version 5.2.0.14
haskell-JuicyPixels: update to version 3.1.5.1
haskell-ghc-events: update to version 0.4.3.0
haskell-github: update to version 0.8
haskell-libmpd: update to version 0.8.0.3