Update reflex and the code

diff --git a/.gitignore b/.gitignore
index de7a3004c276c2797975f8fd72da9afbf6197daa..fcc0acf77fd8d04ca2e3f26ad39564d70f15e2c3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,7 @@ cabal.sandbox.config
 .*.sw?
 dist-ghcjs
 dist-newstyle
-result
\ No newline at end of file
+result
+*.js_o
+*.js_hi
+*.jsexe
\ No newline at end of file

diff --git a/CTT.hs b/CTT.hs
index 82a2b19d4a3b502f7932725b3763e65d39b3f175..b738c5a72faddb4b1a967d6fa2050b83c879aa5f 100644 (file)
--- a/CTT.hs
+++ b/CTT.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, DeriveAnyClass, DeriveGeneric #-}
 module CTT where
 
 import Data.Aeson

diff --git a/Connections.hs b/Connections.hs
index 47cb2b398b9368c8094af99a659963b0b584a8cd..98f6f3fc1ebb78308986632acf39918309ad4d39 100644 (file)
--- a/Connections.hs
+++ b/Connections.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE TypeSynonymInstances, FlexibleInstances,
              GeneralizedNewtypeDeriving, TupleSections,
-             StandaloneDeriving #-}
+             StandaloneDeriving, DeriveAnyClass, DeriveGeneric #-}
 module Connections where
 
 import Data.Aeson

diff --git a/Exp/Abs.hs b/Exp/Abs.hs
index cf66a4f1dd62dc4bd6821b08c1c348bc617dc9c5..b06b86dad09cb1a094ad9c883fbf5e7bb7409336 100644 (file)
--- a/Exp/Abs.hs
+++ b/Exp/Abs.hs
@@ -1,5 +1,6 @@
 -- Haskell data types for the abstract syntax.
 -- Generated by the BNF converter.
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
 
 module Exp.Abs where
 

diff --git a/Helpers.hs b/Helpers.hs
index bb833129bbeb7074b62f0d8909b4088dbb2da2ce..f1cb1db81f5d46616091d135fca81e47d818dadc 100644 (file)
--- a/Helpers.hs
+++ b/Helpers.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE OverloadedStrings #-}
 module Helpers where
 
 import Control.Monad

diff --git a/Main.hs b/Main.hs
index 51529925ab4dc46e03c1913a82f629f05b7972d1..e0afe6f17991ed7dc49e9ddf9f9fdb22c850c18d 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -3,6 +3,8 @@
 {-# LANGUAGE JavaScriptFFI #-}
 {-# LANGUAGE TemplateHaskell #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
+{-# LANGUAGE OverloadedStrings #-}
 
 module Main where
 
@@ -67,7 +69,7 @@ headWidget = do
     <> "crossorigin" =: "anonymous") blank
   elAttr "link" ("data-name" =: "vs/editor/editor.main"
     <> "rel" =: "stylesheet"
-    <> "href" =: "https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/editor/editor.main.css") blank
+    <> "href" =: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/editor/editor.main.css") blank
   el "style" $ text "html, body { height: 100%; }"
 
 bodyWidget :: Widget t ()
@@ -111,7 +113,7 @@ bodyWidget = do
               elAttr "button" ("id" =: "eval-button" <> "type" =: "button"
                 <> "class" =: "btn btn-outline-secondary") $ text "Eval"
   let
-    vsPath = "https://microsoft.github.io/monaco-editor/node_modules/monaco-editor/min/vs/"
+    vsPath = "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.21.0/min/vs/"
   el "script" $ text $ "var app = {}; var require = { paths: { 'vs': '" <> vsPath <>  "'} };"
   elAttr "script" ("src" =: (vsPath <> "loader.js")) blank
   elAttr "script" ("src" =: (vsPath <> "editor/editor.main.nls.js")) blank

diff --git a/Resolver.hs b/Resolver.hs
index d997f80d75b5658e3db14e7a3574e435f4cfa585..1ecba8a963cf16360b06b984437c16a92fcceacf 100644 (file)
--- a/Resolver.hs
+++ b/Resolver.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE TupleSections #-}
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
 
 -- | Convert the concrete syntax into the syntax of cubical TT.
 module Resolver where

diff --git a/TypeChecker.hs b/TypeChecker.hs
index 7a3fcfbd06e6f8b0f7ed902faab69a1e79d04b80..b6c4b83d99acd57048feb13c8e02c99e7be0fd4d 100644 (file)
--- a/TypeChecker.hs
+++ b/TypeChecker.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE OverloadedStrings #-}\r
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}\r
 {-# LANGUAGE BangPatterns #-}\r
 {-# LANGUAGE TupleSections #-}\r
 module TypeChecker where\r

diff --git a/default.nix b/default.nix
index fb7125b08e9de9502d052018137ff637637421ab..c404047f94a38aec692e26b4bb1d152642d8942e 100644 (file)
--- a/default.nix
+++ b/default.nix
@@ -2,7 +2,7 @@ reflex-platform-args:
 
 let
   reflexPlatformSrc = builtins.fetchTarball {
-    url = "https://github.com/reflex-frp/reflex-platform/archive/df0bdcca5eb2a3236ec0496e4430d91876b29cf5.tar.gz";
+    url = "https://github.com/reflex-frp/reflex-platform/archive/5370095262d4255039223d7ac640c571fc3a05c0.tar.gz";
   };
 
   ghcjsIgnoreOverrides = self: super:

diff --git a/shell.nix b/shell.nix
index ee98cc477826ef20e3fab826f2bbc1d78b637a83..c63cce21294ecb78f8928184294016ae0e26b4ab 100644 (file)
--- a/shell.nix
+++ b/shell.nix
@@ -1 +1 @@
-(import ./default.nix { }).shells.ghc
+(import ./default.nix { }).shells.ghcjs