Merge branch 'master' of https://github.com/NixOS/nixos into nameservers

Conflicts:
	modules/tasks/network-interfaces.nix
Merge pull request #147 from offlinehacker/nameservers

Static nameservers should have precedence
systemd: add "requiredBy" option.

"require" is a stronger version of "want",
and just like wantedBy allows you to specify this relation in reverse,
requiredBy does the same.

It may seem pointless to be able to specify these stronger relations in
reverse, because if something is really required, you would expect the
other unit to specify this himself.

However, this is still useful for virtual/automatic units (like
devices) that are created by systemd on demand and hence have no unit
file you can alter.
virtual network interfaces: make systemd aware of the relation between device and service

If I want to bring down tap0.service (or systemd wants to do this
during a configuration-change which changes the path to tunctl),
openvpn (or other services using tap0) need to be brought down as
well, otherwise tunctl -d is not able to remove the tap0 device,
leaving it in a failed (but "up") state.
cron: set TZDIR so cron is able to find the TZ
Freenet: fix 2 typos
Don't set $TZ

We don't need to set $TZ, because we have /etc/localtime.  In fact,
setting $TZ without $TZDIR doesn't work anymore since Glibc no longer
contains zone info.
Create a /etc/zoneinfo symlink and use it in $TZDIR

Setting $TZDIR to ${pkgs.tzdata}/share/zoneinfo can cause logged-in
sessions to refer to a garbage-collected zoneinfo directory.  So use
/etc/zoneinfo instead.
restart networkmanager on suspend resume
lightdm: Initial expression for lightdm as the display-manager service (using default GTK greeter)
lightdm: improving a bit the indentation.
nixos-install: fix error message consistency

The test is for path A but the error message says path B. Fix it.
Putting the gnunet module up to date. It still doesn't start gnunet though.

No idea why.
Making gnunet start properly (calling gnunet-service-arm directly)
Merge pull request #149 from NixOS/networkmanager_suspend

restart networkmanager on suspend resume
Merge pull request #150 from bjornfor/nixos-install-fix-errormsg

nixos-install: fix error message consistency
Removing unneded imports for the display-manager.

Discussed in
https://github.com/NixOS/nixos/commit/2e088aa2779a91b787a44fd9e3f44a9ef2f2edd9#commitcomment-3074283
atd: add "batch" to the list of programs that need a setuid wrapper
Set the firmware_class path in modprobe.d

Activation scripts are run before systemd is started, so unless users
are loading firmware in the initrd (which AFAICT we currently have no
support for) the previous /sys-based setting of firmware_class was
ineffective on boot.

Signed-off-by: Shea Levy <shea@shealevy.com>
gummiboot: Fix bug where old conf scripts for single-digit generations weren't removed

Signed-off-by: Shea Levy <shea@shealevy.com>