BLD Update to LTS-19

Since 19.4, all the dependencies are present. GHC9 should be both faster at compiling and produce faster code.
ngless-toolkit · Apr 18, 2022 · e96ca31 · e96ca31
1 parent d1c80ae
commit e96ca31
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 Unreleased
 	* write() returns the filename used
 	* Switch to tasty test framework
+	* Update to LTS-19
 
 Version 1.3.0 2021-01-28 by luispedro
 	* Validate count() headers on --validate-only

diff --git a/NGLess/Interpretation/Count/RefSeqInfoVector.hs b/NGLess/Interpretation/Count/RefSeqInfoVector.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell, QuasiQuotes #-}
-{- Copyright 2013-2018 NGLess Authors
+{- Copyright 2013-2022 NGLess Authors
  - License: MIT
  -}
 
@@ -34,7 +34,7 @@ import           System.IO.Unsafe (unsafeDupablePerformIO)
 import qualified Language.C.Inline.Context as C
 import qualified Language.C.Inline.Unsafe as CU
 import qualified Language.C.Inline.Cpp as C
-import qualified Language.C.Inline.Cpp.Exceptions as C
+import qualified Language.C.Inline.Cpp.Exception as C
 
 
 foreign import ccall "&rsiv_free" c_rsiv_free :: FunPtr (Ptr () -> IO ())

diff --git a/NGLess/JSONScript.hs b/NGLess/JSONScript.hs
@@ -1,4 +1,4 @@
-{- Copyright 2017-2020 NGLess Authors
+{- Copyright 2017-2022 NGLess Authors
  - License: MIT
  -}
 
@@ -10,6 +10,7 @@ import           System.IO.SafeWrite (withOutputFile)
 import           Data.Aeson
 import           Data.Aeson.Types (Pair)
 import           Control.Arrow (second)
+import           Data.String (fromString)
 import qualified Data.Text as T
 import qualified Data.ByteString.Lazy as BL
 
@@ -27,7 +28,7 @@ jsonType :: String -> Pair
 jsonType = ("type" .=)
 
 sP :: T.Text -> T.Text -> Pair
-sP a b = a .= b
+sP a b = fromString (T.unpack a) .= b
 
 
 encodeMod (ModInfo n v) = object [jsonType "module", "name" .= n, "version" .= v]
@@ -61,7 +62,7 @@ toJSONEx (Optimized oe) = object [jsonType "optimized", "value" .= encodeOpt oe]
 toJSONIndex (IndexOne e) = object [jsonType "index1", "arg" .= toJSONEx e]
 toJSONIndex (IndexTwo e0 e1) = object [jsonType "index2", "left" .= maybe Null toJSONEx e0, "right" .= maybe Null toJSONEx e1]
 
-toJSONKwArgs kwargs = object [n .= toJSONEx e | (Variable n, e) <- kwargs]
+toJSONKwArgs kwargs = object [fromString (T.unpack n) .= toJSONEx e | (Variable n, e) <- kwargs]
 
 encodeOpt (LenThresholdDiscard (Variable n) bop t) = object [jsonType "len-threshold", "name" .= toJSON n, "op" .= encodeBOp bop, "thresh" .= toJSON t]
 encodeOpt (SubstrimReassign (Variable n) mq) = object [jsonType "substrim-reassign", "name" .= toJSON n, "minqual" .= toJSON mq]

diff --git a/stack.yaml b/stack.yaml
@@ -1,19 +1,13 @@
 # For more information, see: https://github.com/commercialhaskell/stack/blob/release/doc/yaml_configuration.md
 
-resolver: lts-17.10
+resolver: lts-19.4
 compiler-check: newer-minor
 
 # Packages to be pulled from upstream that are not in the resolver (e.g., acme-missiles-0.3)
 extra-deps:
   - git: "https://github.com/ngless-toolkit/interval-to-int"
     commit: "78289f6b48d41f7cc48169520ec9b77b050a0029"
-  - diagrams-core-1.4.2@sha256:47de45658e8a805b7cb7f535e7b093daf7e861604fa3c70e25bd4ef481bf1571,2997
-  - diagrams-lib-1.4.3@sha256:04f77778d4b550d3c8e54440800685f88467bef91075e82e009a8a6f45c51033,8232
-  - diagrams-svg-1.4.3@sha256:36708b0b4cf35507ccf689f1a25f6f81b8f41c2c4c2900793de820f66d4e241c,3181
-  - active-0.2.0.14@sha256:e618aba4a7881eb85dc1585e0a01230af6b4fbab6693931e4a5d0d3a5b184406,1823
-  - dual-tree-0.2.2.1@sha256:9ff31e461d873ae74ba51d93b454c0c4094726d7cb78a0c454394c965e83539d,2830
-  - monoid-extras-0.5.1@sha256:438dbfd7b4dce47d8f0ca577f56caf94bd1e21391afa545cad09fe7cf2e5793d,2333
-  - svg-builder-0.1.1@sha256:22de54d326a6b6912e461e1302edb9108b02aac0b6a6368fcdc3c4a224d487fd,1440
+
 allow-newer: true
 
 # Override default flag values for local packages and extra-deps