Merge pull request #2582 from chexxor/feature/add-znc-module

Add ZNC module
empathy: fix icons
telepathy-gabble: build on hydra
Merge pull request #3190 from cstrahan/watchman

watchman: new package
Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2 added. Low/High-level API for git
Merge pull request #3197 from wavewave/gitlib

Haskell packages, hlibgit2, gitlib, gitlib-test, gitlib-libgit2
Set default kernel to 3.14

It is the latest longterm http://permalink.gmane.org/gmane.linux.kernel/1738612
Update `macvim` package to v7.4.355

MacVim's maintenance has stagnated, so this moves `macvim` to a new maintainer.
Additionally, the `-headerpad_max_install_names` linker flag is passed to
prevent problems when setting the rpaths.
haskell-hlibgit2: re-generate with cabal2nix
haskell-gtkglext: re-generate with cabal2nix
haskell-packages.nix: delete obsolete 'gtk2hsC2hs' alias
Merge pull request #3189 from aherrmann/pr_licenses

License meta-data for numexpr, tables, and szip
Merge pull request #2963 from Fuuzetsu/locate

locate service: allow customisation
pretty: new haskell package
Upgrade rsyslog to latest (v7) stable release. Added liblogging (new dependency of rsyslog).
Revert "pretty: new haskell package"

This reverts commit 51dc75b7692ce41527685507ea7f6f5dc2cb6ec5. The pretty
library is a core package since (at least) GHC 6.10.4, i.e. every single one of
our compilers ships this library by default. Adding the package to the global
namespace like this is almost certainly going to cause trouble because we'll
end up with inconsistently linked binaries whenever packages mix the user-space
pretty library with the core one.
mediawiki: add patch for fixing postgresql errors
linux: Update to 3.12.24

CVE-2014-4508, CVE-2014-0206.
libxklavier: fix not finding xkbcomp (fixes #3173)

Also refactor the expression a bit,
and add description+license.
xfce4-xkb-plugin: maintenance update