Merge branch 'master' into staging

... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
parent 21df05d1ad 8fbdb40ef0
commit 81039713fa
239 changed files with 14833 additions and 1959 deletions
@@ -5,7 +5,7 @@
 let
  inherit (bootPkgs) ghc;

-in 
+in
 stdenv.mkDerivation rec {
  version = "8.0.1";
  name = "ghc-${version}";