Merge branch 'master' into lpgf

# Conflicts:
#	gf.cabal

gf.cabal

@@ -41,11 +41,11 @@ data-files:
 
 custom-setup
   setup-depends:
-    base,
-    Cabal >=1.22.0.0,
+    base >= 4.9.1 && < 4.15,
+    Cabal >= 1.22.0.0,
     directory >= 1.3.0 && < 1.4,
     filepath >= 1.4.1 && < 1.5,
-    process >=1.0.1.1
+    process >= 1.0.1.1 && < 1.7
 
 source-repository head
   type: git
@@ -75,23 +75,26 @@ library
   default-language: Haskell2010
   build-depends:
     -- GHC 8.0.2 to GHC 8.10.4
-    base >= 4.9.1 && < 4.15,
     array >= 0.5.1 && < 0.6,
-    containers >= 0.5.7 && < 0.7,
+    base >= 4.9.1 && < 4.15,
     bytestring >= 0.10.8 && < 0.11,
-    utf8-string >= 1.0.1.1 && < 1.1,
-    random >= 1.1 && < 1.3,
-    pretty >= 1.1.3 && < 1.2,
-    mtl >= 2.2.1 && < 2.3,
+    containers >= 0.5.7 && < 0.7,
+    exceptions >= 0.8.3 && < 0.11,
+    ghc-prim >= 0.5.0 && < 0.7,
     hashable >= 1.2.6 && < 1.4,
+    mtl >= 2.2.1 && < 2.3,
+    pretty >= 1.1.3 && < 1.2,
+    random >= 1.1 && < 1.3,
     text >= 1.2.2 && < 1.3,
     unordered-containers >= 0.2.8 && < 0.3,
-    -- For compatability with GHC < 8
-    exceptions >= 0.8.3 && < 0.11,
-    fail >= 4.9.0 && < 4.10,
+    utf8-string >= 1.0.1.1 && < 1.1,
     -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
-    transformers-compat >= 0.5.1.4 && < 0.7,
-    ghc-prim >= 0.5.0 && < 0.7
+    transformers-compat >= 0.5.1.4 && < 0.7
+
+  if impl(ghc<8.0)
+    build-depends:
+      fail >= 4.9.0 && < 4.10
+
   hs-source-dirs: src/runtime/haskell
 
   other-modules:
@@ -157,13 +160,13 @@ library
 ---- GF compiler as a library:
 
   build-depends:
-    filepath >= 1.4.1 && < 1.5,
     directory >= 1.3.0 && < 1.4,
-    time >= 1.6.0 && < 1.10,
-    process >= 1.4.3 && < 1.7,
+    filepath >= 1.4.1 && < 1.5,
     haskeline >= 0.7.3 && < 0.9,
+    json >= 0.9.1 && < 0.11,
     parallel >= 3.2.1.1 && < 3.3,
-    json >= 0.9.1 && < 0.11
+    process >= 1.4.3 && < 1.7,
+    time >= 1.6.0 && < 1.10
 
   hs-source-dirs: src/compiler
   exposed-modules:
@@ -299,9 +302,9 @@ library
 
   if flag(server)
     build-depends:
+      cgi >= 3001.3.0.2 && < 3001.6,
       httpd-shed >= 0.4.0 && < 0.5,
-      network>=2.3 && <2.7,
-      cgi >= 3001.3.0.2 && < 3001.6
+      network>=2.3 && <2.7
     if flag(network-uri)
       build-depends:
         network-uri >= 2.6.1.0 && < 2.7,
@@ -353,8 +356,8 @@ library
       Win32 >= 2.3.1.1 && < 2.7
   else
     build-depends:
-      unix >= 2.7.2 && < 2.8,
-      terminfo >=0.4.0 && < 0.5
+      terminfo >=0.4.0 && < 0.5,
+      unix >= 2.7.2 && < 2.8
 
   if impl(ghc>=8.2)
     ghc-options: -fhide-source-paths