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
jdk7: update patchversion 51 -> 55.
Bump mpv to 0.3.8
Add subtitle option for ffmpeg.
Fix whitespace
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>