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 :-/
Add expression for cabal-install 1.20.0.0
Fix icu4c expression for latest gcc (fixes #2341)
Updated OCaml package findlib
Updated OCaml package pcre
Add expression for sage
haskell-msgpack: add version 0.7.2.5
Updated react to 1.0.1
nethogs: Add package

nethogs is a small 'net top' tool, grouping bandwidth by process.
Fixed pkgconfig support for poppler-qt4
Added TeXmaker package : an advanced editor for latex
Adding myself to lib/maintainers.nix
New package: lists and its dependency, list-extras (Haskell.)
axis2: Remove the extra slash in URL
DisnixWebService: Fix broken build by exposing jdk as buildInputs