Skip to content

Commit b810100

Browse files
committed
Update to GHC 9.0.2
1 parent e393085 commit b810100

File tree

4 files changed

+4
-66
lines changed

4 files changed

+4
-66
lines changed

src/Radlang/Parser/General.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import Control.Applicative (liftA2)
55
import Control.Monad
66
import Control.Monad.Identity
77
import Data.Void
8-
import Data.Text as T
8+
import Data.Text as T hiding (elem)
99
import Data.List as DL
1010
import Text.Megaparsec
1111
import Text.Megaparsec.Char

src/Radlang/QQ.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ rawrdl = QuasiQuoter { quoteExp = quoteRawrdlExp, quotePat = undefined, quoteDec
6060

6161

6262
-- |Parser for QuasiQuoting
63-
parseRawrdl :: Monad m => (String, Int, Int) -> String -> m RawProgram
63+
parseRawrdl :: MonadFail m => (String, Int, Int) -> String -> m RawProgram
6464
parseRawrdl (file, _line, _col) s =
6565
let parser = skipMany controlChar *> rawProgram <* eof
6666
in case parse parser file s of

src/Radlang/Typesystem/Typesystem.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Data.List as DL
1010
import qualified Data.Map.Strict as M
1111
import Data.Set (Set)
1212
import qualified Data.Set as S
13-
import Data.Text as T
13+
import Data.Text as T hiding (elem)
1414

1515
import Radlang.Error
1616
import Radlang.Types

stack.yaml

+1-63
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,3 @@
1-
# This file was automatically generated by 'stack init'
2-
#
3-
# Some commonly used options have been documented as comments in this file.
4-
# For advanced use and comprehensive documentation of the format, please see:
5-
# https://docs.haskellstack.org/en/stable/yaml_configuration/
6-
7-
# Resolver to choose a 'specific' stackage snapshot or a compiler version.
8-
# A snapshot resolver dictates the compiler version and the set of packages
9-
# to be used for project dependencies. For example:
10-
#
11-
# resolver: lts-3.5
12-
# resolver: nightly-2015-09-21
13-
# resolver: ghc-7.10.2
14-
# resolver: ghcjs-0.1.0_ghc-7.10.2
15-
#
16-
# The location of a snapshot can be provided as a file or url. Stack assumes
17-
# a snapshot provided as a file might change, whereas a url resource does not.
18-
#
19-
# resolver: ./custom-snapshot.yaml
20-
# resolver: https://example.com/snapshots/2018-01-01.yaml
21-
resolver: lts-13.2
22-
# resolver: nightly-2018-11-20
23-
24-
# User packages to be built.
25-
# Various formats can be used as shown in the example below.
26-
#
27-
# packages:
28-
# - some-directory
29-
# - https://example.com/foo/bar/baz-0.0.2.tar.gz
30-
# - location:
31-
# git: https://github.com/commercialhaskell/stack.git
32-
# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
33-
# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a
34-
# subdirs:
35-
# - auto-update
36-
# - wai
1+
resolver: lts-19.23
372
packages:
383
- .
39-
# Dependency packages to be pulled from upstream that are not in the resolver
40-
# using the same syntax as the packages field.
41-
# (e.g., acme-missiles-0.3)
42-
# extra-deps:
43-
# Override default flag values for local packages and extra-deps
44-
# flags: {}
45-
46-
# Extra package databases containing global packages
47-
# extra-package-dbs: []
48-
49-
# Control whether we use the GHC we find on the path
50-
# system-ghc: true
51-
#
52-
# Require a specific version of stack, using version ranges
53-
# require-stack-version: -any # Default
54-
# require-stack-version: ">=1.7"
55-
#
56-
# Override the architecture used by stack, especially useful on Windows
57-
# arch: i386
58-
# arch: x86_64
59-
#
60-
# Extra directories used by stack for building
61-
# extra-include-dirs: [/path/to/dir]
62-
# extra-lib-dirs: [/path/to/dir]
63-
#
64-
# Allow a newer minor version of GHC than the snapshot specifies
65-
# compiler-check: newer-minor

0 commit comments

Comments
 (0)