herbstluftwm: update to 0.6.2
jdk7: update patchversion 51 -> 55.
Bump mpv to 0.3.8
Add subtitle option for ffmpeg.
Fix whitespace
Creation of a new package for texstudio, an editor for LaTeX documents
Add the necessary preConfigure so that TeXstudio compile (find poppler-qt4.h)
Cleaning up the description and fixing qt to qt4
Adding myself as maintainer of texstudio
haskell: new expression cabal-bounds
flashplayer: Update to 11.2.202.356

CVE-2014-0515
modernize nixos-generate-config
Handle Zabbix agent and server both being enabled

This gave an error about the zabbix user uid being defined multiple
times.
Actually use services.mysql.port

Fixes #1315
Merge remote-tracking branch 'origin/modernize_nixos_generate_config'

modernize nixos-generate-config
Punctuation
Don't make the EFI tests release-critical

They're failing on i686: http://hydra.nixos.org/build/10712961
chatzilla: Update to 0.9.90.1

Also, make it work with recent Firefoxes.
qemu-guest.nix: Load virtio_rng

This allows the guest to have a paravirtualized RNG, if the host
provides it.
Shea told me composableDerivation is hard to understand.

Thus comment it and why it was written long time ago until it'll get replaced piecewise.