gdk_pixbuf: bugfix update
libgcrypt, libgpgerror: bugfix updates
dbus: bugfix update (still 1.6 branch)
python: 2.7.3 -> 2.7.4
xfce4session: fix a bug causing random crashes

This should work, finally https://bugzilla.xfce.org/show_bug.cgi?id=9709
Add python-elpy-1.0.1: Backend for the elpy Emacs mode
fontconfig: Use /etc/fonts by default again

This removes the need to set $FONTCONFIG_FILE, which is especially
important when using Nixpkgs binaries on non-NixOS systems.

See also 9301524c500e7e7567d5da54b3f3d7d07e53d921.  This is a
regression caused by a change in fontconfig's configure switches.
Calligra: fix build with KDE 4.10
KDE 4.10: propagate nepomuk_core along with kdepimlibs.
nginx: Update to 1.2.8
libgphoto2: fix build on i686 via a minor update
Merge pull request #509 from coroa/elpy-pkg

Add python-elpy-1.0.1: Backend for the elpy Emacs mode
Update Linux versions
Updates: Wine, SBCL, XBoard
Merge branch 'master' into x-updates

Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
xfce4session: bugfix update, superseding the patches
xfce: minor updates for several components

Now tumbler doesn't segfault for me
(at least not as soon as it used to).
Add Fedora 18
experimental/multiple-versions-in-one-file

This patch introduces mergeAttrsByVersion to lib.

In some cases it does make sense to keep "experimental" and "older" versions of
the same package in one file because it follows the "do it once only" principle.
Very often many versions share their build instructions - so even though I
understand Eelcos opinion that different versions should be put into their own
.nix files - its my feeling telling me that this is fastest for most cases.

I agree with Eelco that if tweaks for individual versions become too much they
should be split into individual files.

See comments above mergeAttrsByVersion learn about its usage.

Signed-off-by: Marc Weber <marco-oweber@gmx.de>
add versionedDerivation