haskell-shake: update to version 0.11.7
Merge pull request #2516 from jwiegley/dovecot

Allow Dovecot to build with clucene, and on any Unix
dovecot: build Linux packages on Hydra, and enable local builds on all other systems
Merge pull request #2517 from jwiegley/texinfo

Disable Texinfo tests on Darwin

https://github.com/NixOS/nixpkgs/issues/2338
Merge pull request #2531 from jwiegley/djinn

Add an expression for the Haskell library djinn
r-generic-builder.nix: build packages from the extracted $srcdir so that we have a chance to patch them
r-RcppArmadillo: fix build (and update to 0.4.300.0)
re-introduce phpXdebug as phpPackages.xdebug and bump to 2.2.5

this uses buildPecl now.
libav: Disable tests

These appear to fail randomly sometimes:

http://hydra.nixos.org/build/10854615
Add liblbfgs 1.10
dovecot-2.2.x: add missing sqlite build input

Fixes <http://hydra.nixos.org/build/10863508/nixlog/1/raw>.
Update ffmpeg to 2.2.2
Update pygtk to 2.24.0 to fix CPU pegging issues in xpra
Update xpra to 0.12.5
Merge branch 'phpPackages-xdebug' of git://github.com/proger/nixpkgs

re-introduce phpXdebug as phpPackages.xdebug and bump to 2.2.5
USe maven.test.skip in stead of maven.test.skip.exec in mvn assembly, to prevent unnecessary compilation.
haskell-defaults.nix: fix the "highPrio" variant of the haskell package set

"High priority" is not the same the thing as "not explicitly marked as
low priority".
Mark the development version of weechat 'lowPrio' so that user install
the stable release version by default.
Containers: Use systemd-nspawn's --keep-unit flag

This gets rid of some redundant scopes/slices.
Containers: Use systemd-nspawn's --network-veth flag

Note that this causes the name of the host-side interface to change
from c-<name> to ve-<name>.