Merge branch 'master' into staging

2019-09-02 23:25:24 +02:00
parent b291f2a995 12ae04518b
commit f21211ebfe
277 changed files with 4766 additions and 1895 deletions
@@ -236,4 +236,9 @@ rec {
    useLLVM = true;
  };

+  # Ghcjs
+  ghcjs = {
+    config = "js-unknown-ghcjs";
+    platform = {};
+  };
 }