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
esniper: update to version 2.31.0
nix-prefetch-git: fix printing of revision

If the user explictly gives a ref such as "refs/heads/master", `git
rev-parse` failed because we only checked out the `fetchgit`
branch. Now, we also try `git rev-parse fetchgit` if the first call
fails, which fixes the issue.
nix-prefetch-{bzr,hg,svn}: print fetched revision
Merge pull request #2899 from bennofs/nix-prefetch-revision

nix-prefetch-*: print fetched revision
haskell-pipes-text: new expression
firefox: bump to 30.0.
teamviewer: fix broken links (close #2901)
lib: Do not take string context into account

Close #2883.
Merge #2711: add ansible-1.6.1

Conflicts (trivial):
	lib/maintainers.nix
add htop fork for darwin (close #2690)

@vcunat made it a single conditional attribute.

Conflicts (trivial):
	lib/maintainers.nix