Skip to content

Commit 4f01073

Browse files
committed
Allow GHC 8.0
1 parent 67d6faa commit 4f01073

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

apply-merge.cabal

+5-4
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ copyright: Preetham Gujjula
1818
license: BSD-3-Clause
1919
build-type: Simple
2020
tested-with:
21-
GHC == 8.2.2
21+
GHC == 8.0.2
22+
, GHC == 8.2.2
2223
, GHC == 8.4.4
2324
, GHC == 8.6.5
2425
, GHC == 8.8.4
@@ -58,7 +59,7 @@ library
5859
ghc-options: -Wall
5960
build-depends:
6061
array ==0.5.*
61-
, base >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
62+
, base >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
6263
, containers >=0.6 && <0.7 || >=0.7 && <0.8
6364
, pqueue >=1.4 && <1.5 || >=1.5 && <1.6
6465
, reflection ==2.1.*
@@ -100,7 +101,7 @@ test-suite apply-merge-tests
100101
ghc-options: -Wall
101102
build-depends:
102103
array ==0.5.*
103-
, base >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
104+
, base >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
104105
, containers >=0.6 && <0.7 || >=0.7 && <0.8
105106
, data-ordlist ==0.4.*
106107
, pqueue >=1.4 && <1.5 || >=1.5 && <1.6
@@ -145,7 +146,7 @@ benchmark apply-merge-benchmarks
145146
ghc-options: -Wall
146147
build-depends:
147148
array ==0.5.*
148-
, base >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
149+
, base >=4.9 && <4.10 || >=4.10 && <4.11 || >=4.11 && <4.12 || >=4.12 && <4.13 || >=4.13 && <4.14 || >=4.14 && <4.15 || >=4.15 && <4.16 || >=4.16 && <4.17 || >=4.17 && <4.18 || >=4.18 && <4.19 || >=4.19 && <4.20 || >=4.20 && <4.21
149150
, containers >=0.6 && <0.7 || >=0.7 && <0.8
150151
, data-ordlist ==0.4.*
151152
, pqueue >=1.4 && <1.5 || >=1.5 && <1.6

bench/Bench/ApplyMerge.hs

+8-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,14 @@ collapseToBenchmark name collapse = bgroup name (map mkBench [1 .. 6])
8282
let limit :: Int
8383
limit = 10 ^ i
8484

85-
applyMerges :: [(String, ApplyMerge)]
85+
-- For some reason, GHC 8.0 complains if we set the signature
86+
-- applyMerges :: [(String, ApplyMerge)]
87+
-- We can remove this hack once we drop support for GHC 8.0
88+
applyMerges ::
89+
[ ( String,
90+
forall a b c. (Ord c) => (a -> b -> c) -> [a] -> [b] -> [c]
91+
)
92+
]
8693
applyMerges =
8794
[ ("DoublyLinkedList", ApplyMerge.DoublyLinkedList.applyMerge),
8895
("IntMap", ApplyMerge.IntMap.applyMerge),

package.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ copyright: "Preetham Gujjula"
1414
license: BSD-3-Clause
1515

1616
tested-with:
17+
- GHC == 8.0.2
1718
- GHC == 8.2.2
1819
- GHC == 8.4.4
1920
- GHC == 8.6.5
@@ -51,7 +52,7 @@ when:
5152
- -Wunused-packages
5253

5354
dependencies:
54-
- base ^>= {4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20}
55+
- base ^>= {4.9, 4.10, 4.11, 4.12, 4.13, 4.14, 4.15, 4.16, 4.17, 4.18, 4.19, 4.20}
5556

5657
library:
5758
source-dirs: src

0 commit comments

Comments
 (0)