Skip to content

Commit 57ceb16

Browse files
dpwizcblp
authored andcommitted
Update deps
* New stack config with GHC 8.8
1 parent 2042b01 commit 57ceb16

File tree

10 files changed

+57
-17
lines changed

10 files changed

+57
-17
lines changed

.travis.yml

+4
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ script:
5757

5858
matrix:
5959
include:
60+
- compiler: GHC 8.8
61+
env: STACK_YAML="ghc-8.8.yaml"
62+
install: build_deps
6063
- compiler: GHC 8.6
64+
env: STACK_YAML="ghc-8.6.yaml"
6165
install: build_deps
6266
- compiler: GHC 8.4
6367
env: STACK_YAML="ghc-8.4.yaml"

ghc-8.8.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
resolver: lts-16.0
2+
3+
packages:
4+
- ron
5+
- ron-rdt
6+
- ron-schema
7+
- ron-storage
8+
- ron-test
9+
- swarm
10+
- examples
11+
- demo
12+
13+
extra-deps:
14+
# packages:
15+
- hedn-0.3.0.1
16+
# demo
17+
# - hoppy-generator-0.7.1
18+
# - hoppy-runtime-0.7.0
19+
# - hoppy-std-0.7.1
20+
# - qtah-cpp-qt5-0.7.0
21+
# - qtah-generator-0.7.1
22+
# - qtah-qt5-0.7.0
23+
# ron-test:
24+
# - ormolu-0.0.2.0
25+
26+
extra-lib-dirs:
27+
- swarm/_artifacts/lib

ron-rdt/lib/RON/Data/RGA.hs

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE FlexibleContexts #-}
23
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
34
{-# LANGUAGE LambdaCase #-}
@@ -35,8 +36,13 @@ module RON.Data.RGA
3536
)
3637
where
3738

39+
#if MIN_VERSION_Diff(0,4,0)
40+
import Data.Algorithm.Diff (PolyDiff (Both, First, Second),
41+
getGroupedDiffBy)
42+
#else
3843
import Data.Algorithm.Diff (Diff (Both, First, Second),
3944
getGroupedDiffBy)
45+
#endif
4046
import Data.Bifunctor (second)
4147
import qualified Data.HashMap.Strict as HashMap
4248
import Data.Map.Strict ((!?))

ron-rdt/ron-rdt.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ extra-source-files:
2323
CHANGELOG.md
2424

2525
common language
26-
build-depends: base >= 4.10 && < 4.13, integer-gmp
27-
default-extensions: MonadFailDesugaring NoImplicitPrelude StrictData
26+
build-depends: base >= 4.10 && < 4.15, integer-gmp
27+
default-extensions: NoImplicitPrelude StrictData
2828
default-language: Haskell2010
2929

3030
library
3131
import: language
3232
build-depends:
3333
-- global
3434
containers,
35-
Diff < 0.4,
35+
Diff < 0.5,
3636
hashable,
3737
mtl,
3838
text,

ron-schema/lib/Data/EDN/Extra.hs

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE CPP #-}
12
{-# LANGUAGE DisambiguateRecordFields #-}
23
{-# LANGUAGE LambdaCase #-}
34
{-# LANGUAGE OverloadedStrings #-}
@@ -52,8 +53,11 @@ decodeMultiDoc sourcePos input =
5253
$ Mpc.runParser' parseMultiDoc initState
5354
where
5455
initState = Mpc.State{
55-
stateInput = input,
56-
stateOffset = 0,
56+
stateInput = input,
57+
stateOffset = 0,
58+
#if MIN_VERSION_megaparsec(8,0,0)
59+
stateParseErrors = [],
60+
#endif
5761
statePosState = Mpc.PosState{
5862
pstateInput = input,
5963
pstateOffset = 0,

ron-schema/ron-schema.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ extra-source-files:
2323
CHANGELOG.md
2424

2525
common language
26-
build-depends: base >= 4.10 && < 4.13, integer-gmp
27-
default-extensions: MonadFailDesugaring NoImplicitPrelude StrictData
26+
build-depends: base >= 4.10 && < 4.15, integer-gmp
27+
default-extensions: NoImplicitPrelude StrictData
2828
default-language: Haskell2010
2929

3030
library
@@ -33,7 +33,7 @@ library
3333
-- global
3434
bytestring,
3535
containers,
36-
hedn >= 0.2 && < 0.3,
36+
hedn >= 0.2 && < 0.4,
3737
megaparsec,
3838
mtl,
3939
template-haskell,

ron-storage/ron-storage.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ extra-source-files:
2323
CHANGELOG.md
2424

2525
common language
26-
build-depends: base >= 4.10 && < 4.13, integer-gmp
27-
default-extensions: MonadFailDesugaring NoImplicitPrelude StrictData
26+
build-depends: base >= 4.10 && < 4.15, integer-gmp
27+
default-extensions: NoImplicitPrelude StrictData
2828
default-language: Haskell2010
2929

3030
library

ron-test/ron-test.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ flag style
99
manual: True
1010

1111
common language
12-
build-depends: base >= 4.10 && < 4.13, integer-gmp
13-
default-extensions: MonadFailDesugaring NoImplicitPrelude StrictData
12+
build-depends: base >= 4.10 && < 4.15, integer-gmp
13+
default-extensions: NoImplicitPrelude StrictData
1414
default-language: Haskell2010
1515

1616
library

ron/lib/RON/Event.hs

+2-3
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ import Data.Hashable (hashUsing, hashWithSalt)
3838
import Data.Time (fromGregorianValid, makeTimeOfDayValid)
3939

4040
import RON.Util.Word (pattern B00, pattern B01, pattern B10,
41-
pattern B11, Word12, Word16, Word2, Word24,
42-
Word32, Word6, Word60, Word64, Word8,
43-
leastSignificant12, leastSignificant2,
41+
pattern B11, Word12, Word2, Word24, Word6,
42+
Word60, leastSignificant12, leastSignificant2,
4443
leastSignificant24, leastSignificant4,
4544
leastSignificant6, ls12, ls24, ls6, ls60,
4645
safeCast)

ron/ron.cabal

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ extra-source-files:
2323
CHANGELOG.md
2424

2525
common language
26-
build-depends: base >= 4.10 && < 4.13, integer-gmp
27-
default-extensions: MonadFailDesugaring NoImplicitPrelude StrictData
26+
build-depends: base >= 4.10 && < 4.15, integer-gmp
27+
default-extensions: NoImplicitPrelude StrictData
2828
default-language: Haskell2010
2929

3030
library

0 commit comments

Comments
 (0)