Merge singletons 3.0

.github/workflows/ci.yml

@@ -41,6 +41,7 @@ jobs:
           - stack-yaml: 'stack-8.2.yaml'
           - stack-yaml: 'stack-8.4.yaml'
           - stack-yaml: 'stack-8.6.yaml'
+          - stack-yaml: 'stack-8.8.yaml'
           - stack-yaml: 'stack.yaml'
 
     steps:

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Singletons.hs

@@ -17,12 +17,14 @@
 #endif
 
 module IHaskell.Display.Widgets.Singletons where
-  
-import           Data.Singletons.TH
 
-#if MIN_VERSION_singletons(2,4,0)
+#if MIN_VERSION_singletons(3,0,0)
+import           Data.Singletons.Base.TH
+#elif MIN_VERSION_singletons(2,4,0)
+import           Data.Singletons.TH
 #else
 import           Data.Singletons.Prelude.Ord
+import           Data.Singletons.TH
 #endif
 
 -- Widget properties

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs

@@ -13,6 +13,7 @@
 {-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE ExistentialQuantification #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE AutoDeriveTypeable #-}
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 
@@ -86,16 +87,19 @@ import           Data.Vinyl.Functor (Compose(..), Const(..))
 import           Data.Vinyl.Lens (rget, rput, type (∈))
 import           Data.Vinyl.TypeLevel (RecAll)
 
-#if MIN_VERSION_singletons(2,4,0)
+#if MIN_VERSION_singletons(3,0,0)
+import           Data.List.Singletons
+#elif MIN_VERSION_singletons(2,4,0)
 import           Data.Singletons.Prelude.List
 #else
 import           Data.Singletons.Prelude ((:++))
 #endif
 
-import           Data.Text.Lazy (unpack)
-import           Data.Text.Lazy.Encoding
-
+#if MIN_VERSION_singletons(3,0,0)
+import           Data.Singletons.Base.TH
+#else
 import           Data.Singletons.TH
+#endif
 
 import           GHC.IO.Exception
 

ipython-kernel/examples/Calc.hs

@@ -222,6 +222,7 @@ mkConfig var = KernelConfig
     , languageFileExtension = ".txt"
     , languageCodeMirrorMode = "null"
     , languagePygmentsLexer = "Text"
+    , languageMimeType = "x/extended-huttons-razor"
     }
   , writeKernelspec = const $ return $ KernelSpec
     { kernelDisplayName = "Hutton's Razor"

ipython-kernel/examples/Simple.hs

@@ -62,6 +62,7 @@ languageConfig = LanguageInfo
   , languageFileExtension = ".txt"
   , languageCodeMirrorMode = "null"
   , languagePygmentsLexer = "Text"
+  , languageMimeType = "x/funcalc"
   }
 
 languageKernelspec :: KernelSpec

stack-8.8.yaml

@@ -52,4 +52,4 @@ nix:
     - pango
     - pkgconfig
     - zeromq
-    - zlib
+    - zlib