sync with upstream

dhall-lang · Mar 28, 2018 · 536e3a9 · 536e3a9
1 parent 922e20e
commit 536e3a9
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/dhall.cabal b/dhall.cabal
@@ -153,8 +153,8 @@ Source-Repository head
 Library
     Hs-Source-Dirs: src
     Build-Depends:
-        base                        >= 4.9.0.0  && < 5   ,
-        ansi-terminal               >= 0.6.3.1  && < 0.8 ,
+        base                        >= 4.8.2.0  && < 5   ,
+        ansi-terminal               >= 0.6.3.1  && < 0.8 ,          
         base16-bytestring                        < 0.2 ,
         bytestring                               < 0.11,
         case-insensitive                         < 1.3 ,
@@ -178,7 +178,9 @@ Library
         text                        >= 0.11.1.0 && < 1.3 ,
         transformers                >= 0.2.0.0  && < 0.6 ,
         unordered-containers        >= 0.1.3.0  && < 0.3 ,
-        vector                      >= 0.11.0.0 && < 0.13
+        vector                      >= 0.11.0.0 && < 0.13,
+        semigroups                  >= 0.8.3.1  && < 1 
+
     Exposed-Modules:
         Dhall,
         Dhall.Context,
@@ -190,7 +192,7 @@ Library
         Dhall.TypeCheck
     Other-Modules:
         Dhall.Pretty.Internal
-    GHC-Options: -Wall -Wcompat
+    GHC-Options: -Wall
 
 Executable dhall
     Hs-Source-Dirs: dhall
@@ -204,24 +206,24 @@ Executable dhall
         prettyprinter-ansi-terminal >= 1.1.1    && < 1.2 ,
         megaparsec                  >= 6.4.0    && < 6.5 ,
         text                        >= 0.11.1.0 && < 1.3
-    GHC-Options: -Wall -Wcompat
+    GHC-Options: -Wall
     Other-Modules:
         Paths_dhall
 
-Executable dhall-repl
-    Hs-Source-Dirs: dhall-repl
-    Main-Is: Main.hs
-    Build-Depends:
-        base             >= 4        && < 5   ,
-        ansi-terminal                         ,
-        dhall                                 ,
-        haskeline        >= 0.7.3.0  && < 0.8 ,
-        mtl              >= 2.2.1    && < 2.3 ,
-        repline          >= 0.1.6.0  && < 0.2 ,
-        prettyprinter                         ,
-        prettyprinter-ansi-terminal           ,
-        text
-    GHC-Options: -Wall -Wcompat
+-- Executable dhall-repl
+--     Hs-Source-Dirs: dhall-repl
+--     Main-Is: Main.hs
+--     Build-Depends:
+--         base             >= 4        && < 5   ,
+--         ansi-terminal                         ,
+--         dhall                                 ,
+--         haskeline        >= 0.7.3.0  && < 0.8 ,
+--         mtl              >= 2.2.1    && < 2.3 ,
+--         repline          >= 0.1.6.0  && < 0.2 ,
+--         prettyprinter                         ,
+--         prettyprinter-ansi-terminal           ,
+--         text
+--     GHC-Options: -Wall -Wcompat
 
 Executable dhall-format
     Hs-Source-Dirs: dhall-format
@@ -235,7 +237,7 @@ Executable dhall-format
         prettyprinter               >= 1.2.0.1  && < 1.3 ,
         prettyprinter-ansi-terminal >= 1.1.1    && < 1.2 ,
         text                        >= 0.11.1.0 && < 1.3
-    GHC-Options: -Wall -Wcompat
+    GHC-Options: -Wall
     Other-Modules:
         Paths_dhall
 
@@ -255,7 +257,7 @@ Test-Suite test
     Type: exitcode-stdio-1.0
     Hs-Source-Dirs: tests
     Main-Is: Tests.hs
-    GHC-Options: -Wall -Wcompat
+    GHC-Options: -Wall
     Other-Modules:
         Format
         Normalization

diff --git a/src/Dhall.hs b/src/Dhall.hs
@@ -9,7 +9,7 @@
 {-# LANGUAGE RecordWildCards     #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE StandaloneDeriving  #-}
-{-# LANGUAGE TypeApplications    #-}
+-- {-# LANGUAGE TypeApplications    #-}
 {-# LANGUAGE TypeOperators       #-}
 
 {-| Please read the "Dhall.Tutorial" module, which contains a tutorial explaining
@@ -878,7 +878,7 @@ instance Inject Scientific where
 
 instance Inject Double where
     injectWith =
-        fmap (contramap (Data.Scientific.fromFloatDigits @Double)) injectWith
+        fmap (contramap (Data.Scientific.fromFloatDigits :: Double -> Scientific)) injectWith
 
 instance Inject () where
     injectWith _ = InputType {..}