From 777d717d228cee3dc2cdc12ea4e5d1859bb6f82d Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 9 Nov 2015 10:08:14 -0800
Subject: [PATCH] Revert "Use Default-extensions rather than ghc-options for
NoImplicitPrelude."
This reverts commit 67cabb2a0d09df17fa4f86b77f66e39a6f036c1d.
---
pandoc.cabal | 12 ++++--------
1 file 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