Merge branch 'master' into x-updates
gtk2: minor update .20 -> .22
mesa: bugfix update 9.1.6 -> .7

Thist is just for master before the official release,
x-updates has 9.2.* already.
gnome-autogen.sh: make check_m4macros aware of ACLOCAL_PATH
new systemd can't inhibit lid switches

Conflicts (repos merge):
	modules/services/x11/display-managers/default.nix
Merge #1082: Update QtCreator to 2.8.1, add Qt 5.1.1 and QtSDK
polkit WIP: TESTED OK, only missing NM config testing/tweaking

History: 7a29bd02 7cd5ff085
polkit WIP: resurrect the forgotten polkituser

It needs no group anymore. I hope it won't clash with leftovers from
previous usage of the user.
polkit WIP: enable forgotten config for NetworkManager

and only authorize "active" sessions.
dbus: minor update 1.6.14 -> .16 "fortify agility"
mesa: add GLES 1 and 2 support by default

The libs have just a few kilobytes and no additional deps.
mesa: bugfix update 9.2.1 -> .2

On 9.2.* we seem to be hitting a [problem] on Hydra
(unlikely to be fixed by this update),
although the tests run fine on my machine.

[problem] https://bugs.freedesktop.org/show_bug.cgi?id=67672
changes proposed for 'release-13.10' into x-updates

Conflicts (simple, taking whole higher/later versions):
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/polkit/default.nix
perl: avoid --no-cpp-precomp on darwin, (close #1160)

Taken from https://trac.macports.org/ticket/38913
vcunat renamed the patch

Conflicts (trivial):
	pkgs/development/interpreters/perl/5.16/default.nix
darwin x11/opengl: only copy subset of files (close #1165)

Copy only the pc files related to X11 and OpenGL.

This should allow us to build our own version of libraries like
cairo without having the native ones be accidentally dynamically
linked in to things that depend on them.

Before this patch if we `dyldinfo -dylibs libpangocairo` we can
see that it was dynamically linked against the OS X (but seemingly
built against include files from the nix one, as we would get a
runtime complaint about missing symbols)
mesa: disable checkPhase for the time being

The problem doesn't seem serious and it only occurs on some HW.
However, it would be best to fix this before merging into master.
xorg-server: bugfix update 1.14.3 -> .4, including CVE

CVE-2013-4396, otherwise a few fixes, see
http://lists.x.org/archives/xorg-announce/2013-November/002352.html
xorg-server: remove now-upstreamed patch

I'm sorry I completely forgot to test the previous commit.
Also remove some long unused patch.
wget darwin: disable Test-iri-disabled.px

This test fails on MacOS X. The failure has something to do with
the tests expecting filesystems to accept/store filenames as
bytes. On the HFS+ filesystem, however, filenames are Unicode
characters (Normalisation Form D).

This wget ticket appears to be relevant
    http://savannah.gnu.org/bugs/index.php?27541

The maintainer does not seem to think that this test
failure represents a problem in practice:
    http://article.gmane.org/gmane.comp.web.wget.general/8988

But this patch should be revisited/removed if this aspect of wget is
ever addressed in the future.

NB: I'm also a bit concerned/confused that none of the tests mentioned
in that message seem to fail, so I'm not 100% sure if this is the
relevant issue.
Emacs darwin: avoid X unless explictly requested

This keeps the dependencies lighter. Perhaps future work on this
derivation could enable the Cocoa interface by default on Mac.