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.
Merge branch 'x-updates': mesa 10.0.* -> 10.1.1

Also minor xorg bumps.
Merge pull request #2432 from Fuuzetsu/livestreamer

livestreamer: version 1.8.0
Add some packages to the channel
haskell-enumset: re-generate with cabal2nix
haskell-tz: fix build (of the test suite)
haskell-jack: re-generate with cabal2nix
haskell-hfsevents: re-generate with cabal2nix
gpm: Depend on /dev/input/mice