aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-11-09 10:08:14 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2015-11-09 10:08:14 -0800
commit777d717d228cee3dc2cdc12ea4e5d1859bb6f82d (patch)
tree1799d5b20e18aa6cdaa0be754ddddeaf2c37a634
parent384d03dcfe6466e459db004a6376633ae98d2c3e (diff)
downloadpandoc-777d717d228cee3dc2cdc12ea4e5d1859bb6f82d.tar.gz
Revert "Use Default-extensions rather than ghc-options for NoImplicitPrelude."
This reverts commit 67cabb2a0d09df17fa4f86b77f66e39a6f036c1d.
-rw-r--r--pandoc.cabal12
1 files changed, 4 insertions, 8 deletions
diff --git a/pandoc.cabal b/pandoc.cabal
index 2c7447706..feb6ea1df 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -303,10 +303,9 @@ Library
other-modules: Text.Pandoc.Data
if os(windows)
Cpp-options: -D_WINDOWS
- Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
+ Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind -XNoImplicitPrelude
Ghc-Prof-Options: -fprof-auto-exported -rtsopts
Default-Language: Haskell98
- Default-Extensions: NoImplicitPrelude
Other-Extensions: PatternGuards, OverloadedStrings,
ScopedTypeVariables, GeneralizedNewtypeDeriving,
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
@@ -421,12 +420,11 @@ Executable pandoc
Build-Depends: network-uri >= 2.6 && < 2.7, network >= 2.6
else
Build-Depends: network >= 2 && < 2.6
- Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind
+ Ghc-Options: -rtsopts -with-rtsopts=-K16m -Wall -fno-warn-unused-do-bind -XNoImplicitPrelude
Ghc-Prof-Options: -fprof-auto-exported -rtsopts -with-rtsopts=-K16m
if os(windows)
Cpp-options: -D_WINDOWS
Default-Language: Haskell98
- Default-Extensions: NoImplicitPrelude
Other-Extensions: PatternGuards, OverloadedStrings,
ScopedTypeVariables, GeneralizedNewtypeDeriving,
RelaxedPolyRec, DeriveDataTypeable, TypeSynonymInstances,
@@ -498,9 +496,8 @@ Test-Suite test-pandoc
Tests.Writers.Docx
Tests.Writers.RST
Prelude
- Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded
+ Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind -threaded -XNoImplicitPrelude
Default-Language: Haskell98
- Default-Extensions: NoImplicitPrelude
benchmark benchmark-pandoc
Type: exitcode-stdio-1.0
@@ -510,7 +507,6 @@ benchmark benchmark-pandoc
base >= 4.2 && < 5,
syb >= 0.1 && < 0.7,
criterion >= 1.0 && < 1.2
- Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind
+ Ghc-Options: -rtsopts -Wall -fno-warn-unused-do-bind -XNoImplicitPrelude
Default-Language: Haskell98
- Default-Extensions: NoImplicitPrelude
Other-Modules: Prelude