network-interfaces: Add an option for specifying search to resolv.conf
nixos: Add zram swap module

This allows you to use the Linux kernel's built-in compressed memory as
swap space functionality.

It is recommended to enable only for kernel 3.14 (which is when zram came out of
the staging drivers area) or higher.
Scatter output hook

This hook allows to scatter files in $out to multiple outputs.
For "bin" and "doc" outputs there are prefefined default masks, but
they can be overriden by setting files_<outname>, for example:

files_bin = [ "/bin/*" "/lib/libexec/" ];

To make an effect hook must be specified in buildInputs.
make use of new extractRuntimeHook
ansible: add package
ansible: Add maintainer
ansible: conventions, fix module execution
Merge branch 'master' of https://github.com/NixOS/nixpkgs into ansible
ansible: add boto as dependency for s3 module
Don't hardcode shell, use $SHELL instead
Update haskell-hspec to version 1.10.0
Merge pull request #2891 from sol/master

Update haskell-hspec to version 1.10.0
haskell-spawn: new package, v0.3
haskell-io-memoize: new package, v1.0.0.0
haskell-hspec2: new package, v0.3.0
Merge pull request #2893 from soenkehahn/master

New Haskell packages
Fix configuring httpd with custom user/group.
lilypond: cosmetic changes
all-packages.nix: cosmetic changes
haskell-libmpd: test suite build is broken by recent hspec update