d9c5d584cd
It's been a very long time, so I think a merge will be better than a rebase. There was only one simple conflict.
*** NixOS *** NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at http://nixos.org/nixos and in the manual in doc/manual.