Fix xf86vmware fix

Moved xf86vmware fix into the overrides.nix file where and not in the
generated default.nix.
recode: attempt to fix Darwin testsuite build problem
Update mysql workbench version
pygobject: update to 2.28.6

This fixes an issue with MyPaint: https://gna.org/bugs/?20400
add xchainkeys-0.11
need to link against -lgcc_s for the testsuite to work
XML-LibXML-2.0014, as XML-LibXML-2.0001 doesn't exist upstream anymore
Merge branch 'fixVmwareFix' of git://github.com/Davorak/nixpkgs

The original fix modified a generated file instead of the
manually-maintained overrides file. Checked by inspection.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'recode.130306' of git://github.com/jcumming/nixpkgs

Attempts to fix recode build on darwin, verified by inspection (don't
have a readily available darwin machine for testing right now, will let
hydra see if this worked).

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'master' of git://github.com/fignuts/nixpkgs

This updates mysql-workbench. Didn't compile before, compiles now.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge remote-tracking branch 'upstream/pygobject-2.28.6'

This branch updates pygobject (the diff itself is trivial), which
affects a lot of packages but due to the recent stdenv merge this seems
like a good time for this.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'xchainkeys' of git://github.com/iyzsong/nixpkgs

This adds a new package, xchainkeys. It builds, so I ship.

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'tor.130308' of git://github.com/jcumming/nixpkgs

This commit ensures tor is linked to lgcc_s. Tests didn't pass before,
pass now.

Signed-off-by: Shea Levy <shea@shealevy.com>
tor: Don't use NIX_CFLAGS_LINK where CFLAGS will do
tor: minor cleanups

Signed-off-by: Shea Levy <shea@shealevy.com>
Merge branch 'perl.130308' of git://github.com/jcumming/nixpkgs

Trivial update to XML-LibXML perlPackage

Signed-off-by: Shea Levy <shea@shealevy.com>
man-pages: Update to 3.48
Exporting XFCE gvfs: it is referenced in NixOS, it is unclear how to remove the dependency cleanly and it affects rebuild even with config that doesn't mention XFCE at all.
zbar requires v4l1; disabe video
add older pycrypto25