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
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
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
Revert "Add vtop, update some node packages."

This reverts commit cf3a2d04751fcc875656b0af6bf2e7f728cf770d.
t1utils: new package

t1utils is a collection of simple Type 1 font manipulation programs.
lilypond: unbreak build by adding t1utils to buildInputs

lilypond needs the 't1asm' tool from t1utils to build. t1asm used to be
provided by texlive-core, but does no more  (since texlive-core-2014
update).
Merge pull request #2904 from bennofs/haskell-pipes-text

haskell-pipes-text: new expression
qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.

Close #2643.

Testing parallel build of qt5: fine on @vcunat's 8-core (just this single task).
We'll see on Hydra.
cudatoolkit: fix multiple outputs (close #2466)