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.
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.
linux-3.15: upgrade to 3.15.1
Merge pull request #2976 from bluescreen303/nginx

nginx: fix group, statedir permissions, add echo module, fix aio
Merge branch 's3cmd-git' of git://github.com/fmapfmapfmap/nixpkgs
Merge pull request #2991 from bluescreen303/kernel-3.15

linux-3.15: upgrade to 3.15.1
nixos.tests.installer: Fix test failures due to network being disabled
sublime3: fix plugin_host (close #2804)

Also move the binaries in their own package, so it doesn't pollute the
profile.
nixos-iso: Re-enable new kernel iso images (close #2839)
jd-gui: version 0.3.5

Signed-off-by: Austin Seipp <aseipp@pobox.com>
nixos manual: fix typo (close #2997)
Don't suggest using --arg config '{ allowUnfree = true; }'

This doesn't work when using the Nixpkgs/NixOS channel.

Issue #2998.
arcanist: 20140606 -> 20140617

Signed-off-by: Austin Seipp <aseipp@pobox.com>
duo-unix: upgrade, fix full name + version

Signed-off-by: Austin Seipp <aseipp@pobox.com>
Create an option to build 3.16-rc1 which carries a new Wireless driver; make USB_DEBUG optional as it seems to be planned to disappear in 3.16.