Skip to content

Commit b7c6a95

Browse files
author
Gaël Deest
committed
Fix tested-with fields in Cabal files
Also re-added `servant-client` to `cabal.ghcjs.project`, setting `buildable: False` on tests as they don't run with GHCJS.
1 parent e9ae1ee commit b7c6a95

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

cabal.ghcjs.project

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
packages:
44
servant/
5+
servant-client/
56
servant-client-core/
67

78
-- we need to tell cabal we are using GHCJS

servant-client-core/servant-client-core.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ maintainer: [email protected]
1717
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
1818
build-type: Simple
1919
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
20-
, GHCJS == 8.4
20+
, GHCJS ==8.6.0.1
2121

2222
extra-source-files:
2323
CHANGELOG.md

servant-client/servant-client.cabal

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ maintainer: [email protected]
2121
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
2222
build-type: Simple
2323
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
24+
, GHCJS ==8.6.0.1
2425

2526
extra-source-files:
2627
CHANGELOG.md
@@ -82,6 +83,8 @@ test-suite spec
8283
type: exitcode-stdio-1.0
8384
ghc-options: -Wall -rtsopts -threaded "-with-rtsopts=-T -N2"
8485
default-language: Haskell2010
86+
if impl(ghcjs)
87+
buildable: False
8588
hs-source-dirs: test
8689
main-is: Spec.hs
8790
other-modules:
@@ -137,3 +140,5 @@ test-suite readme
137140
build-tool-depends: markdown-unlit:markdown-unlit
138141
ghc-options: -pgmL markdown-unlit
139142
default-language: Haskell2010
143+
if impl(ghcjs)
144+
buildable: False

servant/servant.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant
2121
build-type: Simple
2222

2323
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
24-
, GHCJS == 8.4
24+
, GHCJS ==8.6.0.1
2525

2626
extra-source-files:
2727
CHANGELOG.md

0 commit comments

Comments
 (0)