Merge pull request #127 from zudov/cleanup

Small Cleanup

Application.hs

@@ -7,9 +7,7 @@ module Application
 
 import           Control.Concurrent (forkIO, threadDelay)
 import           Control.Exception (catch)
-import           Control.Monad.Logger (runLoggingT)
 import           Data.WebsiteContent
-import qualified Database.Persist
 import           Import hiding (catch)
 import           Language.Haskell.TH.Syntax (Loc(..))
 import           Network.Wai (Middleware, responseLBS)
@@ -18,7 +16,6 @@ import           Network.Wai.Middleware.RequestLogger
     ( mkRequestLogger, outputFormat, OutputFormat (..), IPAddrSource (..), destination
     )
 import qualified Network.Wai.Middleware.RequestLogger as RequestLogger
-import           Settings
 import           System.Log.FastLogger (newStdoutLoggerSet, newFileLoggerSet, defaultBufSize, fromLogStr)
 import qualified System.Random.MWC as MWC
 import           Yesod.Core.Types (loggerSet, Logger (Logger))
@@ -26,7 +23,6 @@ import           Yesod.Default.Config
 import           Yesod.Default.Handlers
 import           Yesod.Default.Main
 import           Yesod.GitRepo
-import           System.Environment (getEnvironment)
 import           System.Process (rawSystem)
 import           Stackage.Database.Cron (loadFromS3)
 
@@ -131,8 +127,6 @@ makeFoundation useEcho conf = do
         handleAny print refreshDB
         handleAny print $ grRefresh websiteContent'
 
-    env <- getEnvironment
-
     let logger = Yesod.Core.Types.Logger loggerSet' getter
         foundation = App
             { settings = conf

Echo.hs

@@ -11,9 +11,6 @@ module Echo where
 
 import Control.Concurrent.MVar
 import Control.Monad.Trans      (MonadIO(..))
-#if !MIN_VERSION_time(1,5,0)
-import System.Locale
-#endif
 import Data.Time
 import Language.Haskell.TH
 import Language.Haskell.TH.Lift

Foundation.hs

@@ -1,11 +1,8 @@
 module Foundation where
 
 import           ClassyPrelude.Yesod
-import           Data.Slug (HasGenIO (getGenIO), randomSlug, Slug)
+import           Data.Slug (HasGenIO (getGenIO))
 import           Data.WebsiteContent
-import qualified Database.Persist
-import           Database.Persist.Sql (PersistentSqlException (Couldn'tGetSQLConnection))
-import qualified Settings
 import           Settings (widgetFile, Extra (..))
 import           Settings.Development (development)
 import           Settings.StaticFiles
@@ -13,9 +10,6 @@ import qualified System.Random.MWC as MWC
 import           Text.Blaze
 import           Text.Hamlet (hamletFile)
 import           Types
-import           Yesod.Auth
-import           Yesod.Auth.BrowserId
-import           Yesod.Auth.GoogleEmail2 (authGoogleEmail)
 import           Yesod.Core.Types (Logger)
 import           Yesod.Default.Config
 import           Yesod.GitRepo

Handler/Package.hs

@@ -9,18 +9,10 @@ module Handler.Package
     ) where
 
 import           Data.Char
-import           Data.Slug
-import           Data.Tag
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 import qualified Data.Text.Lazy as LT
 import           Distribution.Package.ModuleForest
-
-import           Database.Esqueleto ((^.))
-import qualified Database.Esqueleto as E
-import qualified Database.Persist as P
-
-import           Formatting
 import           Import
 import qualified Text.Blaze.Html.Renderer.Text as LT
 import           Text.Email.Validate

Handler/Sitemap.hs

@@ -2,7 +2,6 @@ module Handler.Sitemap (getSitemapR) where
 
 import Import
 import Yesod.Sitemap
-import qualified Data.Conduit.List as CL
 import Stackage.Database
 
 type SitemapFor a = forall m. Monad m => Conduit a m (SitemapUrl (Route App))

Import.hs

@@ -9,7 +9,6 @@ import Settings.Development as Import
 import Settings.StaticFiles as Import
 import Types as Import
 import Yesod.Auth as Import
-import Data.Slug (mkSlug)
 import Data.WebsiteContent as Import (WebsiteContent (..))
 import Data.Text.Read (decimal)
 import Stackage.Database (SnapName)

stackage-server.cabal

@@ -179,9 +179,9 @@ executable         stackage-server
 
     main-is:           main.hs
     hs-source-dirs:    app
-    build-depends:     base
+    build-depends:     base                          >= 4.8         &&   < 4.9
                      , stackage-server
-                     , yesod
+                     , yesod                         >= 1.4         &&   < 1.5
 
     ghc-options:       -threaded -O2 -rtsopts -with-rtsopts=-N
 
@@ -201,16 +201,16 @@ test-suite test
     hs-source-dirs:    test
     ghc-options:       -Wall
 
-    build-depends: base
+    build-depends: base                          >= 4.8         &&   < 4.9
                  , stackage-server
-                 , yesod-test >= 1.2
-                 , yesod-core
-                 , yesod
-                 , persistent
-                 , resourcet
-                 , monad-logger
-                 , transformers
-                 , hspec
-                 , classy-prelude-yesod
-                 , mtl
-                 , mwc-random
+                 , yesod-test                    >= 1.4         &&   < 1.5
+                 , yesod-core                    >= 1.4         &&   < 1.5
+                 , yesod                         >= 1.4         &&   < 1.5
+                 , persistent                    >= 2.2         &&   < 2.3
+                 , resourcet                     >= 1.1.6       &&   < 1.2
+                 , monad-logger                  >= 0.3.13      &&   < 0.4
+                 , transformers                  >= 0.4         &&   < 0.5
+                 , hspec                         >= 2.1         &&   < 2.2
+                 , classy-prelude-yesod          >= 0.12        &&   < 0.13
+                 , mtl                           >= 2.2         &&   < 2.3
+                 , mwc-random                    >= 0.13        &&   < 0.14