Merge 'master' into x-updates
mesa: major update 10.0.4 -> 10.1.1
xorg: minor updates of three packages
xorg-server: major update 1.14.5 -> 1.15.1
xorg: revert fontsproto update, as it breaks libXfont

This partially reverts commit 30ac332563318be4e445dc3335e803326df84d3c.
https://groups.google.com/forum/#!msg/xorg-devel/SvgqiQnSN7c/f0wjRhauqvUJ

It's sad that the currently *released* versions don't even compile together,
and no dev reacts for four days so far...
xorg-server: go back to 1.14.6 due to intel problems

Again, stable releases not compiling together :-/
Fix icu4c expression for latest gcc (fixes #2341)
Add expression for sage
Fixed pkgconfig support for poppler-qt4
Added TeXmaker package : an advanced editor for latex
Adding myself to lib/maintainers.nix
livestreamer: version 1.8.0

A test fails with Python 3.4 so we ignore that one.
Update haskell-http-kit to version 0.2.1

Closes #2430

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Update haskell-base-compat to version 0.5.0

Closes #2431

Signed-off-by: Austin Seipp <aseipp@pobox.com>
polkit: Restart using systemctl

The use of pkill is now particularly bad due to containers (it might
kill processes in containers).
Update release notes
Bump some mentions of 13.10
qemu-image: Remove (obsolete)
qemu: Apply patch for CVE-2014-0150, CVE-2014-2894
apr: Update to 1.5.1