Skip to content

Commit eabc31d

Browse files
committed
fixup! Add network-tests flag
1 parent 1de76ad commit eabc31d

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

dhall/dhall.cabal

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ Common common
252252
uri-encode < 1.6 ,
253253
vector >= 0.11.0.0 && < 0.13
254254

255-
GHC-Options: -Wall -Wcompat -Wincomplete-uni-patterns
256255

257256
if flag(with-http)
258257
CPP-Options:
@@ -264,7 +263,7 @@ Common common
264263
CPP-Options:
265264
-DNETWORK_TESTS
266265

267-
Common lib-depends
266+
GHC-Options: -Wall -Wcompat -Wincomplete-uni-patterns
268267
if !impl(ghcjs)
269268
Build-Depends:
270269
cryptohash-sha256
@@ -277,14 +276,19 @@ Common lib-depends
277276
http-client-tls >= 0.2.0 && < 0.4
278277

279278

280-
Custom-Setup
281-
Setup-Depends:
282-
base
283-
, Cabal
284-
, cabal-doctest
279+
Library
280+
Import: common
281+
Hs-Source-Dirs: src
282+
if impl(ghcjs)
283+
Hs-Source-Dirs: ghcjs-src
284+
Build-Depends:
285+
ghcjs-base ,
286+
ghcjs-xhr
287+
else
288+
Hs-Source-Dirs: ghc-src
285289

286290
Library
287-
Import: common, lib-depends
291+
Import: common
288292
if impl(ghcjs)
289293
Hs-Source-Dirs: ghcjs-src
290294
else
@@ -429,17 +433,13 @@ Test-Suite tasty
429433
Default-Language: Haskell2010
430434

431435
Test-Suite doctest
432-
-- This needs the same imports as the library
433-
Import: common, lib-depends
436+
Import: common
434437
Type: exitcode-stdio-1.0
435438
Hs-Source-Dirs: doctest
436439
Main-Is: Main.hs
437440
Build-Depends:
438441
mockery < 0.4 ,
439442
doctest >= 0.7.0 ,
440-
base-compat ,
441-
special-values ,
442-
QuickCheck
443443

444444
if os(windows)
445445
-- https://github.com/dhall-lang/dhall-haskell/issues/2237

0 commit comments

Comments
 (0)