Use "or"
nixos-rebuild: Support Nix's --repair flag
wpa_supplicant: Fix wlan interface detection on Linux 3.4

Linux 3.4 apparently doesn't have the "wireless" file.
Initial wireless configuration docs
don't try to re-import pools on service change

When nixos-rebuild grabs a new kernel, it will build new spl/zfs
modules, which will change the service. On completion nixos will try and
restart the services which will try and import pools again, and
generally will fail.

The pools are already imported, we don't need to do it again..
calling zfs mount -a again doesn't make sense
NFS: Use network-online.target instead of remote-fs-pre.target

Turns out that remote-fs-pre.target is not actually "wanted" anywhere,
so statd is not started before remote filesystems are mounted.  But
remote filesystems do "want" network-online.target, so we can use that
to pull in statd and idmapd.

Not sure if this is really the right thing to do, but it works for
now.  Background:

  https://bugzilla.redhat.com/show_bug.cgi?id=787314

http://hydra.nixos.org/build/5542230
Start sm-notify/statd atfer nfsd

The README of nfs-utils explains that we must not notify clients
before nfsd is running, otherwise they may fail to reclaim their
locks.  OTOH it's allowed but not required to start "rpc.statd
--no-notify" before nfsd.  So for simplicity we do both after starting
nfsd.
Don't pull in the old qemu-kvm
NFS test: Set a fixed fsid

Otherwise clients get a "Stale NFS handle" error after the server
reboots.  Not clear why this is the case, since the fsid shouldn't
change across reboots...
Add a test for NFSv4

However it currently fails because locking seems to be broken with
NFSv4.
Disable the installer.swraid test

This fails randomly for unknown reasons,
e.g. http://hydra.nixos.org/build/5542510.
Work around "Input/output error" opening /dev/ttyS0

E.g. http://hydra.nixos.org/build/5541847

This is a random occurence, maybe due to a race with something else.
So just retry until it works.
Disable the mpich test

It hasn't succeeded in a long time.
Fix the installer tests

E.g. http://hydra.nixos.org/build/5561399
Bump the NixOS version number to 13.07

This is in preparation of making a stable release/branch.  The version
number is <YY>.<MM>, Ubuntu style, denoting the intended release
year/month.  It also has a release codename ("Aardvark").
Include all of KDE in the KDE test
Disable the trac test

It hasn't worked in ages.
Fix the misc test
Fix ISO generation

The volume label cannot be longer than 32 characters.