diff --git a/.ghci b/.ghci index 9fe5b987..39ca3d67 100644 --- a/.ghci +++ b/.ghci @@ -1,5 +1,4 @@ :set -package ghc :set -package ghc-paths :set -i. -isrc -idist/build/autogen -:set -XDoAndIfThenElse -XOverloadedStrings :set prompt "\ESC[34mλ> \ESC[m" diff --git a/ihaskell-display/ihaskell-aeson/ihaskell-aeson.cabal b/ihaskell-display/ihaskell-aeson/ihaskell-aeson.cabal index 91ea4197..f970527e 100644 --- a/ihaskell-display/ihaskell-aeson/ihaskell-aeson.cabal +++ b/ihaskell-display/ihaskell-aeson/ihaskell-aeson.cabal @@ -51,10 +51,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6 && <4.10, diff --git a/ihaskell-display/ihaskell-blaze/ihaskell-blaze.cabal b/ihaskell-display/ihaskell-blaze/ihaskell-blaze.cabal index 9031f3f3..85c3f309 100644 --- a/ihaskell-display/ihaskell-blaze/ihaskell-blaze.cabal +++ b/ihaskell-display/ihaskell-blaze/ihaskell-blaze.cabal @@ -55,10 +55,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6, diff --git a/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal b/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal index 70e8ec10..5331e924 100644 --- a/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal +++ b/ihaskell-display/ihaskell-charts/ihaskell-charts.cabal @@ -52,10 +52,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6, diff --git a/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal b/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal index ca0d5463..7a66c1f9 100644 --- a/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal +++ b/ihaskell-display/ihaskell-diagrams/ihaskell-diagrams.cabal @@ -53,10 +53,6 @@ library -- Modules included in this library but not exported. other-modules: IHaskell.Display.Diagrams.Animation - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings - -- Other library packages from which modules are imported. build-depends: base >=4.6 && <4.10, text, diff --git a/ihaskell-display/ihaskell-gnuplot/ihaskell-gnuplot.cabal b/ihaskell-display/ihaskell-gnuplot/ihaskell-gnuplot.cabal index 069718d0..43e9ee57 100644 --- a/ihaskell-display/ihaskell-gnuplot/ihaskell-gnuplot.cabal +++ b/ihaskell-display/ihaskell-gnuplot/ihaskell-gnuplot.cabal @@ -52,10 +52,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6 && <4.10, diff --git a/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal b/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal index ebe18143..7b1e538c 100644 --- a/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal +++ b/ihaskell-display/ihaskell-juicypixels/ihaskell-juicypixels.cabal @@ -58,10 +58,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6, diff --git a/ihaskell-display/ihaskell-magic/ihaskell-magic.cabal b/ihaskell-display/ihaskell-magic/ihaskell-magic.cabal index 66cfc1a0..abc7d228 100644 --- a/ihaskell-display/ihaskell-magic/ihaskell-magic.cabal +++ b/ihaskell-display/ihaskell-magic/ihaskell-magic.cabal @@ -55,10 +55,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6 && <4.10, diff --git a/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal b/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal index b6946f34..cc5089ec 100644 --- a/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal +++ b/ihaskell-display/ihaskell-plot/ihaskell-plot.cabal @@ -52,10 +52,6 @@ library -- Modules included in this library but not exported. -- other-modules: - - -- Language extensions. - default-extensions: DoAndIfThenElse - OverloadedStrings -- Other library packages from which modules are imported. build-depends: base >=4.6, diff --git a/ihaskell.cabal b/ihaskell.cabal index dc20c7d7..0030582f 100644 --- a/ihaskell.cabal +++ b/ihaskell.cabal @@ -121,12 +121,6 @@ library IHaskellPrelude StringUtils - default-extensions: - NoImplicitPrelude - DoAndIfThenElse - OverloadedStrings - ExtendedDefaultRules - executable ihaskell -- .hs or .lhs file containing the Main module. main-is: Main.hs @@ -156,12 +150,6 @@ executable ihaskell if flag(binPkgDb) build-depends: bin-package-db - default-extensions: - NoImplicitPrelude - DoAndIfThenElse - OverloadedStrings - ExtendedDefaultRules - Test-Suite hspec Type: exitcode-stdio-1.0 Ghc-Options: -threaded @@ -191,11 +179,6 @@ Test-Suite hspec if flag(binPkgDb) build-depends: bin-package-db - default-extensions: - DoAndIfThenElse - OverloadedStrings - ExtendedDefaultRules - source-repository head type: git location: git://github.com/gibiansky/IHaskell.git diff --git a/main/IHaskellPrelude.hs b/main/IHaskellPrelude.hs index da618fad..a49b1ae6 100644 --- a/main/IHaskellPrelude.hs +++ b/main/IHaskellPrelude.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP #-} +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-}{-# LANGUAGE CPP #-} module IHaskellPrelude ( module IHaskellPrelude, module X, diff --git a/main/Main.hs b/main/Main.hs index 2b744465..030621b0 100644 --- a/main/Main.hs +++ b/main/Main.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} {-# LANGUAGE CPP, ScopedTypeVariables #-} -- | Description : Argument parsing and basic messaging loop, using Haskell diff --git a/src/IHaskell/Eval/Widgets.hs b/src/IHaskell/Eval/Widgets.hs index ce10e448..6eb97e71 100644 --- a/src/IHaskell/Eval/Widgets.hs +++ b/src/IHaskell/Eval/Widgets.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} module IHaskell.Eval.Widgets ( widgetSendOpen, widgetSendView, diff --git a/src/IHaskell/Flags.hs b/src/IHaskell/Flags.hs index 59b74e24..2ba9d9aa 100644 --- a/src/IHaskell/Flags.hs +++ b/src/IHaskell/Flags.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} {-# LANGUAGE NoImplicitPrelude, DeriveFunctor #-} module IHaskell.Flags ( diff --git a/src/IHaskell/IPython.hs b/src/IHaskell/IPython.hs index 580a4f48..02607c4a 100644 --- a/src/IHaskell/IPython.hs +++ b/src/IHaskell/IPython.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} {-# LANGUAGE CPP #-} -- | Description : Shell scripting wrapper using @Shelly@ for the @notebook@, and diff --git a/src/IHaskell/Publish.hs b/src/IHaskell/Publish.hs index 9b7818c8..0291b7bf 100644 --- a/src/IHaskell/Publish.hs +++ b/src/IHaskell/Publish.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} module IHaskell.Publish (publishResult) where import IHaskellPrelude diff --git a/src/IHaskell/Types.hs b/src/IHaskell/Types.hs index fe8e1409..130a305e 100644 --- a/src/IHaskell/Types.hs +++ b/src/IHaskell/Types.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE ExistentialQuantification #-} diff --git a/src/IHaskellPrelude.hs b/src/IHaskellPrelude.hs index da618fad..9bc5fbde 100644 --- a/src/IHaskellPrelude.hs +++ b/src/IHaskellPrelude.hs @@ -1,3 +1,4 @@ +{-# language NoImplicitPrelude, DoAndIfThenElse, OverloadedStrings, ExtendedDefaultRules #-} {-# LANGUAGE CPP #-} module IHaskellPrelude ( module IHaskellPrelude,