stack: use LTS-18.13 with GHC 8.10.7

Keep the previous stack.yaml as stack-8.8.4.yaml.

feldspar-language.cabal

@@ -106,15 +106,15 @@ library
   build-depends:
     array,
     base                        >= 4.13.0  && < 5.9,
-    bytestring                  >= 0.10   && < 0.11,
+    bytestring                  >= 0.10   && < 0.12,
     containers                  >= 0.4    && < 0.7,
     data-default                >= 0.5,
     directory                   >= 1.1,
     filepath,
     ghc,
     ghci,
     ghc-paths,
-    language-c-quote            >= 0.12  && < 0.13,
+    language-c-quote            >= 0.12  && < 0.14,
     mtl                         >= 2.0    && < 2.3,
     QuickCheck                  >= 2.7    && < 3,
     patch-combinators           >= 0.2    && < 0.3,
@@ -130,7 +130,7 @@ library
     tuple                       >= 0.2    && < 0.5,
     monad-par                   >= 0.3.4.5,
     deepseq,
-    random                      >= 1.0    && < 1.2,
+    random                      >= 1.0    && < 1.4,
     data-default                >= 0.5.3  && < 0.8,
     data-hash                   >= 0.2.0.1 && < 100,
     tree-view
@@ -235,7 +235,7 @@ test-suite tutorial
   build-depends:
     feldspar-language,
     base,
-    bytestring         >= 0.9 && < 0.11
+    bytestring         >= 0.9
 
   ghc-options: -threaded -with-rtsopts=-maxN12
 
@@ -265,10 +265,10 @@ test-suite regression
     feldspar-language,
     mtl,
     base,
-    bytestring       >= 0.9 && < 0.11,
+    bytestring       >= 0.9,
     directory,
     filepath,
-    random           >= 1.0    && < 1.2,
+    random           >= 1.0    && < 1.4,
     stringsearch     >= 0.3,
     tasty            >= 0.3,
     tasty-golden     >= 2.3.0.1,

hie.yaml

@@ -2,7 +2,7 @@ cradle:
   stack:
     - path: "./src"
       component: "feldspar-language:lib"
-    - path: "./.stack-work/dist/x86_64-linux/Cabal-3.0.1.0/build/autogen"
+    - path: "./.stack-work/dist/x86_64-linux-tinfo6/Cabal-3.2.1.0/build/autogen/"
       component: "feldspar-language:lib"
     - path: "./src/Onnx"
       component: "feldspar-language:exe:onnxToFeld"

src/Onnx/OnnxToFeld.hs

@@ -26,6 +26,7 @@
 -- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --
 {-# OPTIONS_GHC -Wall #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Main where
@@ -56,7 +57,11 @@ import Text.ProtocolBuffers (Utf8, Int64, messageGet, utf8)
 
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.ByteString.Lazy.UTF8 as U
+#if MIN_VERSION_GLASGOW_HASKELL(8,10,0,0)
+import qualified Data.ByteString.Builder as B
+#else
 import qualified Data.ByteString.Lazy.Builder as B
+#endif
 
 import qualified Data.Foldable as D (toList, foldMap, length, concatMap)
 import qualified Data.Sequence as D (Seq, sortBy, sort, index, partition)

stack-8.8.4.yaml

@@ -0,0 +1,80 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-16.12
+
+ghc-options:
+    # Somewhere deep inside there is a call to ghc --make, pass -j3 to
+    # speed up builds. Sys time goes up with -j4 on GHC 8.4 so there
+    # is a slowdown for that.
+    "$locals": -j3
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+- .
+
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+# extra-deps:
+# - acme-missiles-0.3
+# - git: https://github.com/commercialhaskell/stack.git
+#   commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
+#
+extra-deps:
+  [patch-combinators-0.2.2
+  ,prelude-edsl-0.3.1
+  ,data-hash-0.2.0.1
+  ,tree-view-0.5
+  ,plugins-multistage-0.6.3
+  ,protocol-buffers-2.4.13
+  ]
+
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.1"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor

stack.yaml

@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-16.12
+resolver: lts-18.13
 
 ghc-options:
     # Somewhere deep inside there is a call to ghc --make, pass -j3 to
@@ -50,9 +50,9 @@ extra-deps:
   [patch-combinators-0.2.2
   ,prelude-edsl-0.3.1
   ,data-hash-0.2.0.1
-  ,tree-view-0.5
+  ,tree-view-0.5.1
   ,plugins-multistage-0.6.3
-  ,protocol-buffers-2.4.13
+  ,protocol-buffers-2.4.17
   ]
 
 # Override default flag values for local packages and extra-deps