Upgrade: Intel microcodes -> 20160624
Merge pull request #3631 from ts468/ucode

Upgrade: Intel microcodes -> 20160624
git: Update to 2.1.0
nixos-install: Fix copying symlink resolv.conf.

On some non-NixOS systems (for example those using "resolvconf"),
/etc/resolv.conf is a symlink. So let's dereference when copying hasts
and resolv.conf.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
nixos manual: Fix instruction for getting booted kernel confix
dbus: Don't search for Xlibs if useX11 is false.

This particularily fails when using non-chrooted builds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Merge pull request #3636 from linquize/git-2.1.0

git: Update to 2.1.0
nginx: 1.6.0 -> 1.6.1

Signed-off-by: Austin Seipp <aseipp@pobox.com>
elixir: bump to 0.15.1
Merge pull request #3643 from daogames/tb/update-elixir

elixir: bump to 0.15.1
Merge pull request #3637 from nathanielbaxter/dev/nixos_manual

nixos manual: Fix instruction for getting booted kernel confix