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 :-/
Don't mount /sys/fs/fuse/connections and /sys/kernel/config

These fail to mount if you don't have the appropriate kernel support,
and this confuses NixOps' ‘check’ command. We should teach NixOps not
to complain about non-essential mount points, but in the meantime it's
better to turn them off.
switch-to-configuration: Use old systemctl to stop units

Otherwise, when switching from systemd 203 to 212, you get errors like:

  Failed to stop remote-fs.target: Bad message
  Failed to stop systemd-udevd-control.socket: Bad message
  ...
Revert "Don't mount /sys/fs/fuse/connections and /sys/kernel/config"

This reverts commit 6eaced35820f4c575dd545fb721abd74f248c8cb. Doesn't
work very well, e.g. if you actually have the FUSE module loaded. And
in any case it's already fixed in NixOps.
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
Fix EC2 creation script for latest nixops

(cherry picked from commit 361eb3a5f50aba4ecfe08bf37640179dfc2e6453)
Merge branch 'x-updates': mesa 10.0.* -> 10.1.1

Also minor xorg bumps.