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>.
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>.
Containers: Support setting up macvlan interfaces

By setting a line like

  MACVLANS="eno1"

in /etc/containers/<name>.conf, the container will get an Ethernet
interface named mv-eno1, which represents an additional MAC address on
the physical eno1 interface. Thus the container has direct access to
the physical network. You can specify multiple interfaces in MACVLANS.

Unfortunately, you can't do this with wireless interfaces.

Note that dhcpcd is disabled in containers by default, so you'll
probably want to set

  networking.useDHCP = true;

in the container, or configure a static IP address.

To do: add a containers.* option for this, and a flag for
"nixos-container create".
Installer test: Increase amount of RAM

On x86_64, 384 MB is not enough anymore for running "nix-env -i".

http://hydra.nixos.org/build/10865007
haskell-HTTP: update to version 4000.2.14
haskell-contravariant: update to version 0.5.2
haskell-distributive: update to version 0.4.4
haskell-gtk-traymanager: update to version 0.1.4
haskell-hourglass: update to version 0.1.2
haskell-html-conduit: update to version 1.1.0.5