Merge pull request #4845 from proger/ec2-ami-tools-1.5.6

ec2-ami-tools -> 1.5.6, updated license & homepage
Revert "geeqie: xxd is required as build dependency"

This reverts commit 852f0bf2d4f4ae2c58fd414e628d841879163386. Geeqie
builds fine without vim.
geeqie: Don't use fetchgit

Fetchgit considered harmful.
geeqie: Disable libchamplain dependency for now

It causes Geeqie to depend on both GTK+ 2 and 3, which is undesirable.
licenses.publicDomain: Fix typo
Merge recent master into staging

Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f82be3

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
Allow marking licenses as unfree

This allows licenses like the Amazon Software License to be identified
properly while still preventing packages with those licenses from
being distributed in the Nixpkgs/NixOS channels.
Make the license shortName attribute equal to the license attribute name

I.e. lib.licenses.<foo>.shortName == "<foo>". The SPDX identifier (if
known) is kept in lib.licenses.<license>.spdxId.
Provide more SPDX IDs
Merge pull request #4838 from abbradar/ssmtp-root

Add 'root' option to ssmtp
gst-plugins-bad: enable gl plugin (close #4763)
findTarballs: Take nullglob into account
Die tabs die
findTarball: Handle pipefail

It was failing because the bash subshell died with SIGPIPE, which is
no longer ignored.

http://hydra.nixos.org/build/16766452
emacs-idris-mode: upgrade to 0.9.15
new package: swaks, a command line SMTP tool
opkg-utils: new package

Helper scripts for use with the opkg package manager.

Upstream doesn't do releases it seems, so I'm packaging the latest git
version.
Update PhantomJS; should also fix remarkjs
Readd BtrFS-progs 3.16 for snapper build
perl-Net-CIDR: new package

Expression is generated with nix-generate-from-cpan. Then I added
platforms and maintainers.