Merge branch 'master' into x-updates

Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
gnome2.libgnome: fix for new glib (my own patch)
gmime: fix via updating the ancient version
gnome3.at_spi2_core: supply path to system-wide dbus-daemon
python_rsvg: couldn't find gtk, fixed now
linphone: fix build via ignoring deprecations
gnash: fix build via using pangox_compat
gtk+: enable xcursor support, fixes #469

@vcunat also reorganized the build input lists a bit
flattenInclude: a useful utility, moved into glib now
openjpeg: flatten includes to make it better detectable
poppler: update, include qt4+cairo patches

The patches should provide smoother font rendering, like it's with poppler+gtk+cairo.
The code was taken from @mornfall f4fce48c #470, thanks.
pixman: use pixman_cairo for xorg, flatten its includes
xorg: update xorgserver to 1.13.4, and more

- update some modules to work with the newer server
- fix many other modules via overrides
- huge cleanup in overrides via better propagation
  and pixman include flattening
- URLs of XCB stuff have been moved
poppler: share most things between glib and qt4 versions

Most of the stuff was duplicated (headers, the core library).
The new solution makes the _qt4 package use the _glib one,
because it depended on glib through cairo anyway
(and _glib bindings themselves are just ~350kB).

This also fixes a problem that mergeAttrsByFuncDefaultsClean
didn't merge patches, which affected dbus.libs.
Merge pull request #471 from vcunat/p/xorg

xorg updates
qt4: parallel-build impurity fix

Modified to avoid unnecessary rebuilds.
Merge branch 'master' into x-updates

* master: (118 commits)
  curl: Update to 7.30.0
  Revert "experimental/shadow"
  xxdiff: update to current HEAD of the source repository
  hatari: fix pthread_cancel+gcc_s thing, and some spacing
  Auto-update some packages; no early build failures (SBCL and Wine not yet fully built)
  Distrho: fix build: pin premake to version 3
  python-deform: unittest2 needed on python 26
  Revert "let hydra also build python26Packages"
  Add hatari Atari St emulator.
  magit: fix download url
  Fix indention, remove maintainers.
  php: Add 5.4
  libextractor: make gtk support work again
  Adding doodle.
  munge 0.5.10: New package, a credentials handler for clusters
  git: Properly use symlinks instead of hard links
  Revert "git: fix build on FreeBSD"
  haskell-hashable: update to version 1.2.x
  pkgs/top-level/release-haskell.nix: cosmetic
  haskell-haskeline: drop obsolete version 0.6.4.7
  ...

Conflicts:
	pkgs/servers/x11/xorg/overrides.nix
Merge branch 'x-updates' into experimental/x-updates

* x-updates:
  qt4: parallel-build impurity fix
  poppler: share most things between glib and qt4 versions
  xorg: update xorgserver to 1.13.4, and more
  pixman: use pixman_cairo for xorg, flatten its includes
  poppler: update, include qt4+cairo patches
  openjpeg: flatten includes to make it better detectable
  flattenInclude: a useful utility, moved into glib now
  gtk+: enable xcursor support, fixes #469
  gnash: fix build via using pangox_compat
  linphone: fix build via ignoring deprecations
  python_rsvg: couldn't find gtk, fixed now
  gnome3.at_spi2_core: supply path to system-wide dbus-daemon
  gmime: fix via updating the ancient version
  gnome2.libgnome: fix for new glib (my own patch)

Conflicts:
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/lib/misc.nix
Add limnoria, a well maintained fork of Supybot, an IRC bot
Merge branch 'master' into x-updates

Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix