From 407a65b9ba7e0ffb89fc1a5322366906efec721c Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 4 Jul 2019 16:05:02 +0100 Subject: refactor(tazblog): Move required GHC extensions into source Necessary because Cabal is going away. --- services/tazblog/src/Blog.hs | 33 ++++++++++++++++++++++----------- services/tazblog/src/BlogDB.hs | 38 +++++++++++++++++++++++++------------- services/tazblog/src/Locales.hs | 1 + services/tazblog/src/RSS.hs | 1 + services/tazblog/src/Server.hs | 3 +-- 5 files changed, 50 insertions(+), 26 deletions(-) diff --git a/services/tazblog/src/Blog.hs b/services/tazblog/src/Blog.hs index f35e3d90801f..7e0f428899ac 100644 --- a/services/tazblog/src/Blog.hs +++ b/services/tazblog/src/Blog.hs @@ -1,16 +1,27 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} + module Blog where -import BlogDB -import Data.Maybe (fromJust) -import Data.Text (Text, append, empty, pack) -import Data.Text.Lazy (fromStrict) -import Data.Time -import Locales -import Text.Blaze.Html (preEscapedToHtml) -import Text.Hamlet -import Text.Markdown - -import qualified Data.Text as T +import BlogDB +import Data.Maybe (fromJust) +import Data.Text (Text, append, empty, pack) +import Data.Text.Lazy (fromStrict) +import Data.Time +import Locales +import Text.Blaze.Html (preEscapedToHtml) +import Text.Hamlet +import Text.Markdown + +import qualified Data.Text as T replace :: Eq a => a -> a -> [a] -> [a] replace x y = map (\z -> if z == x then y else z) diff --git a/services/tazblog/src/BlogDB.hs b/services/tazblog/src/BlogDB.hs index bc9c24393302..f74f9ecd4fab 100644 --- a/services/tazblog/src/BlogDB.hs +++ b/services/tazblog/src/BlogDB.hs @@ -1,18 +1,30 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE GeneralizedNewtypeDeriving #-} +{-# LANGUAGE MultiParamTypeClasses #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE QuasiQuotes #-} +{-# LANGUAGE RecordWildCards #-} +{-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE TypeFamilies #-} + module BlogDB where -import Control.Monad.Reader (ask) -import Control.Monad.State (get, put) -import Data.Acid -import Data.Acid.Advanced -import Data.Acid.Remote -import Data.ByteString (ByteString) -import Data.Data (Data, Typeable) -import Data.IxSet (Indexable (..), IxSet, Proxy (..), getOne, ixFun, ixSet, (@=)) -import Data.SafeCopy (base, deriveSafeCopy) -import Data.Text (Text, pack) -import Data.Time -import Network (PortID (..)) -import System.Environment (getEnv) +import Control.Monad.Reader (ask) +import Control.Monad.State (get, put) +import Data.Acid +import Data.Acid.Advanced +import Data.Acid.Remote +import Data.ByteString (ByteString) +import Data.Data (Data, Typeable) +import Data.IxSet (Indexable (..), IxSet, Proxy (..), + getOne, ixFun, ixSet, (@=)) +import Data.SafeCopy (base, deriveSafeCopy) +import Data.Text (Text, pack) +import Data.Time +import Network (PortID (..)) +import System.Environment (getEnv) import qualified Crypto.Hash.SHA512 as SHA (hash) import qualified Data.ByteString.Base64 as B64 (encode) diff --git a/services/tazblog/src/Locales.hs b/services/tazblog/src/Locales.hs index c1ddcb38faa4..125e99aef9c7 100644 --- a/services/tazblog/src/Locales.hs +++ b/services/tazblog/src/Locales.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE ScopedTypeVariables, OverloadedStrings #-} module Locales where import BlogDB (BlogLang (..)) diff --git a/services/tazblog/src/RSS.hs b/services/tazblog/src/RSS.hs index 34804cbf0a55..1cfdc7111ef2 100644 --- a/services/tazblog/src/RSS.hs +++ b/services/tazblog/src/RSS.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE RecordWildCards #-} module RSS (renderFeed) where import qualified Data.Text as T diff --git a/services/tazblog/src/Server.hs b/services/tazblog/src/Server.hs index c05e3afb195e..fe26f9544252 100644 --- a/services/tazblog/src/Server.hs +++ b/services/tazblog/src/Server.hs @@ -1,5 +1,4 @@ --- Server implementation based on Happstack - +{-# LANGUAGE RecordWildCards, ScopedTypeVariables, OverloadedStrings, FlexibleContexts #-} module Server where import Control.Applicative (optional) -- cgit 1.4.1