Supplementary derivation for s3cmd, building from git HEAD.
s3cmd-1.5-pre-81e3842f7a: Use more precise naming convention.
s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs.
Mark s3cmd-1.5-pre-81e3842f7a as low priority.
Revert "s3cmd-1.5-pre-81e3842f7a: Use buildInputs, not propagatedBuildInputs."

This reverts commit 01211ff333a8554a45fbf3147a6ac4e550523a59.
Update haskell-http-kit to version 0.5.0
Update haskell-aeson-qq to version 0.7.2
Merge pull request #2967 from sol/master

Update haskell-http-kit and haskell-aeson-qq
hscolour-bootstrap: allow setting RTS options for the hscolour binary we use to generate our documentation

Other tools like hsc2hs or haddock allows this, too, and some tools explicitly
set memory limits on these tools during the build (i.e. llvm-general-pure) by
exposing a GHCRTS environment variable. See [1] for a concrete example of this
issue.

[1] https://github.com/NixOS/nixpkgs/issues/2939
haskell-git-annex: update to version 5.20140613
hscolour-bootstrap: GHC 6.10.x and earlier don't support the -rtsopts option
nixUnstable: bump
Fix generation of synergy-{client,server} when disabled
Upgrade zeromq and nanomsg
Merge pull request #2970 from tailhook/nanomsg_and_zeromq

Upgrade zeromq and nanomsg
rsync: sha256 for the patch was updated
nginx: add echo module, fix aio on linux&freebsd
nixos/nginx: fix group and stateDir permissions

furthermore, I don't think adding nginx to systemPackages is of any use.
libid3tag: apply fixes before build

Amongst other things, this stops things like mpd spinning up to full
memory when updating the database.
mpd: clean up some flags

Some changed, some are no longer used.