WARNING: history will change from now on (mesa updates)

Fix some paths set, drivers in mesa_drivers now, WIP.
networkmanager: clean some attrs missing in nixpkgs x-updates

Just temporary hack.
mesa WIP: fix bad symlinking, thanks to jack_c on IRC
Revert "networkmanager: clean some attrs missing in nixpkgs x-updates"

This reverts commit a649bbea4e2c07b5c10ecc34fc974f8fbe3cda26.
Merge branch 'master' into x-updates
Merge branch 'master' into x-updates
Merge branch 'master' of git://github.com/NixOS/nixos into x-updates
Merge branch 'master' into x-updates