09af15654f
The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.
*** 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.