freetype: Update to 2.4.12

Also update the Infinality patches.

Note that FreeType 2.5 was released a few days ago, but I don't know
how stable it is.
llvm: Update to 3.3

Signed-off-by: Shea Levy <shea@shealevy.com>
clang: Update to 3.3

Signed-off-by: Shea Levy <shea@shealevy.com>
Add nixops
qt4: maintenance update 4.8.4 -> 4.8.5

Also fixed search path for libGL.
Tested building against master.
libxcb: enable XKB extension

SDDM, a display manager that I'm trying to package, depends on this.
mesa: Update to 9.1.4
qt4: fix build on darwin (close #750)
pyqt4: fix build on darwin (close #751)

* build with clangStdenv
libpng: Update to 1.6.3
add haskell-llvm-general
idris: upgrade to 0.9.9
mesa: bugfix update 9.1.4 -> 9.1.6
Merge branch 'master' into x-updates

Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
automake113x: minor update to .4

I can't make glib build without it.
GTK-related minor updates
clean some include flags that weren't really needed

Tested the builds still work (x86_64-linux).
poppler: bugfix update, waiting with major bump
xorg: bugfix updates of some libs

Now using stable release of libXi, instead of the git version we had due
to security stuff.
add introspection into GTK libs (part of #517)

This is all work of Marc Weber <marco-oweber@gmx.de>, except for a few nitpicks.

Tested space blowup: IMHO negligible to headers and similar stuff,
e.g. the firefox closure (reported by du) grows from 560 to 579 MB.
Saving space should be handled separately,
e.g. we have the multiple-outputs branch.