udisks: update from 1.0.4 to 1.0.5
Add claws-mail and libetpan.

Adds Nix expressions for claws-mail (http://www.claws-mail.org) and a
dependency that is not already in the tree, libetpan
(http://www.etpan.org/libetpan.html).

The Claws expression has flags for toggling the build of various plugins.
proot: remove self.stdenv.lib
Merge remote-tracking branch 'nixos/master' into proot

Conflicts:
	pkgs/tools/system/proot/default.nix
new package: svg2tikz
Added granite

Added meta details, changed hash to sha256, and added versions for granite

Changed name to use versions

Fixed license

Yet another typo fix

Added myself as maintainer and fixed typo

Fixed maintainers

Added pantheon terminal

woops
Add MKRAND
zsh: update from 5.0.6 to 5.0.7
Merge pull request #4428 from mknight-tag/master

New package: MKRAND
Astroid 1.2.1
Add license for svg2tikz
Merge pull request #4431 from DamienCassou/astroid-1.2.1

Astroid 1.2.1
Removed akunambol

It is not maintained anymore, and is not compatible with kde 4.14.
Made kde 4.14 the default kde
Removed kde 4.12
Merge pull request #4426 from ollieh/master

Added granite and pantheon-terminal
mailpile: update to 0.4.1
Merge pull request #4434 from matejc/mailpile041

mailpile: update to 0.4.1
add patches for openafs-client on kerel 3.17
Add a jobset for a "nixos-small" channel

This channel only builds a small subset of Nixpkgs, mostly suitable
for servers. Since the channel update doesn't require thousands of
packages to be built first, it should provide much faster turnaround
in case of security updates.

(cherry picked from commit 2c7acc6731ad4b05b1bbc3e632cdfcad4560ac22)