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)
Remove missing attribute

(cherry picked from commit f963f57b6230679c6194889a05fcb7741883af70)
Add an entire NixOS build to the channel

This causes some cruft to be uploaded (such as unit files) but it
ensures that every package used by the base system ends up in the
channel, not just environment.systemPackages.

(cherry picked from commit 4dfca8e14a5d1c2e62bb5ad267163a7a32ef872f)
Add some more stuff to the small channel

(cherry picked from commit 8cf528174465c195dc9807075ef889d91994f018)
Removed kde4_next, because kde 4.14 will be the last kde4
pharo-vm: Add dependency to cairo
Merge pull request #4436 from madjar/kde414

Switch to kde 4.14 and remove 4.12
Revert "mdadm: update from 3.3 to 3.3.2"

This reverts commit 1faf6106c3fc5890297ad6c8e26b572d91dede5a. It
causes the size of the initrd to explode from ~6 MB to 19 MB:

  http://hydra.nixos.org/build/15728196

The reason is that mdadm now contains a self-reference:

  $ strings ./result/sbin/mdadm  | grep /nix/store
  ...
  ACTION=="add", SUBSYSTEM=="block", ENV{DEVTYPE}=="%s", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
  ACTION=="add", SUBSYSTEM=="block", ENV{ID_PATH}=="%s", RUN+="/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdadm --incremental $env{DEVNAME}"
/nix/store/y1ap6va0av6jhxf7ddnr8vdwxd7b44gd-mdadm-3.3.2/sbin/mdmon

(Previously, it referred to /sbin/mdadm.) This causes mdadm, glibc and
linux-headers to be added to the initrd.
Add a Hydra job to track the size of the initrd
thrift builds on darwin
jq builds on darwin
atool's configure script uses bashizm

if test "${startperl:0:1}" = "#" ; then
  startperl="\\$startperl"
fi

This results in an error:
checking for perl... /nix/store/6qvjjaywj6qf8jn9splpiz9qap01w36w-perl-5.16.3/bin/perl
./configure: 2264: ./configure.lineno: Bad substitution
builder for ‘/nix/store/nk9y51xlzsbkhswc5cpl3hkryg2xw85g-atool-0.39.0.drv’ failed with exit code 2
Fixed buidling sysstat

https://github.com/NixOS/nixpkgs/issues/4441
ansible: update from 1.7.1 to 1.7.2
apg: update from 2.2.3 to 2.3.0b
asio: update from 1.10.2 to 1.10.4