Merge branch 'stack'

koterpillar · Oct 25, 2015 · 0b68470 · 0b68470
2 parents 64fa30a + 62b537b
commit 0b68470
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 64 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
-/.cabal-sandbox
-/cabal.sandbox.config
 /content
 /dist
 /.ghci
 /.HTF
+/.stack-work
diff --git a/.travis.yml b/.travis.yml
@@ -1,31 +1,36 @@
 language: haskell
 
 ghc:
-  - 7.8
+  - 7.8  # Only used for Cabal
 
 before_install:
-  - cabal install happy
-  - cabal install hlint
+  - wget https://www.stackage.org/stack/linux-x86_64 -O stack.tar.gz
+  - tar xf stack.tar.gz
+  - mkdir -p $HOME/.local/bin
+  - cp stack-*-linux-x86_64/stack $HOME/.local/bin/stack
+  - stack setup
+  - stack install hlint
 
 install:
-  - cabal install --enable-tests --only-dependencies
-  - cabal configure --enable-tests
-  - cabal build
+  - stack build
 
 script:
   - hlint src testsuite
-  - cabal test
+  - stack test
 
 cache:
   directories:
-    - $HOME/.cabal
-    - $HOME/.ghc
+    - $HOME/.stack
+    - .stack-work
+
+before_deploy:
+  - cp $(stack path --local-install-root)/bin/multiblog .
 
 deploy:
   provider: releases
   api-key:
     secure: "JkeIs3oHq3H3JraOPcuSPfYz0UmwW9PVF43DVnrvWVnT1bIql83YkyEnn8Ac93ybdsewQMUhkEDOBASRcyUI2IAv0/jcf3mmdGkU4lPtz4DlCrygv6e4jkHFaAcSH6T4Kjj+bykWiDTOgUVQu9N67HXAm9M3ll5f+wPerHgSZGw="
-  file: dist/build/multiblog/multiblog
+  file: multiblog
   skip_cleanup: true
   on:
     tags: true

diff --git a/multiblog.cabal b/multiblog.cabal
@@ -15,58 +15,57 @@ Executable multiblog
   main-is: Main.hs
   ghc-options: -Wall -Werror
 
-  Build-depends:
-    blaze-html >= 0.7,
-    blaze-markup >= 0.6,
-    boomerang >= 1.4,
-    bytestring >= 0.10,
-    containers >= 0.5,
-    directory >= 1.2,
-    feed >= 0.3,
-    filepath >= 1.3,
-    happstack-server >= 7.4,
-    iso639 >= 0.1.0.3,
-    mtl >= 2.1 && < 2.3,
-    network >= 2.6,
-    pandoc >= 1.14,
-    pandoc-types >= 1.12,
-    shakespeare >= 2.0,
-    split >= 0.2,
-    system-argv0 >= 0.1,
-    system-filepath >= 0.4,
-    text >= 1.1,
-    time >= 1.4 && < 1.6,
-    xml >= 1.3,
-    web-routes >= 0.27,
-    web-routes-boomerang >= 0.26,
-    web-routes-happstack >= 0.23,
-    web-routes-th >= 0.22,
-    utf8-string >= 0.3,
-    unix >= 2.7,
-    yaml >= 0.8,
-    base >= 4.4 && < 5
+  Build-depends: base >= 4.7 && < 5
+               , blaze-html
+               , blaze-markup
+               , boomerang
+               , bytestring
+               , containers
+               , directory
+               , feed
+               , filepath
+               , happstack-server
+               , iso639
+               , mtl
+               , network
+               , pandoc
+               , pandoc-types
+               , shakespeare
+               , split
+               , system-argv0
+               , system-filepath
+               , text
+               , time
+               , xml
+               , web-routes
+               , web-routes-boomerang
+               , web-routes-happstack
+               , web-routes-th
+               , utf8-string
+               , unix
+               , yaml
 
 Test-Suite tests
   type: exitcode-stdio-1.0
   hs-source-dirs: src, testsuite
   main-is: TestMain.hs
 
-  build-depends:
-    blaze-html >= 0.7,
-    bytestring >= 0.10,
-    containers >= 0.5,
-    directory >= 1.2,
-    filepath >= 1.3,
-    happstack-server >= 7.4,
-    iso639 >= 0.1.0.3,
-    mtl >= 2.1 && < 2.3,
-    pandoc >= 1.14,
-    pandoc-types >= 1.12,
-    shakespeare >= 2.0,
-    split >= 0.2,
-    time >= 1.4 && < 1.6,
-    xml >= 1.3,
-    derive >= 2.5,
-    HTF >= 0.12,
-    HUnit >= 1.2,
-    base >= 4.4 && < 5
+  build-depends: base >= 4.7 && <5
+               , blaze-html
+               , bytestring
+               , containers
+               , directory
+               , filepath
+               , happstack-server
+               , iso639
+               , mtl
+               , pandoc
+               , pandoc-types
+               , shakespeare
+               , split
+               , time
+               , xml
+               , derive
+               , HTF
+               , HUnit
+               , base
diff --git a/src/Language.hs b/src/Language.hs
@@ -2,7 +2,6 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Language where
 
-import Control.Applicative
 import Control.Monad
 
 import Data.Function

diff --git a/src/Routes.hs b/src/Routes.hs
@@ -7,7 +7,6 @@ import Prelude hiding ((.))
 
 import Control.Category (Category ((.)))
 
-import Data.Monoid
 import qualified Data.Text as T
 import Data.Time
 

diff --git a/src/Views.hs b/src/Views.hs
@@ -11,7 +11,6 @@ import Control.Monad.State
 import Data.LanguageCodes
 import qualified Data.Map as M
 import Data.Maybe
-import Data.Monoid
 import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
 import Data.Time

diff --git a/stack.yaml b/stack.yaml
@@ -0,0 +1,10 @@
+flags: {}
+packages:
+- '.'
+extra-deps:
+- boomerang-1.4.5
+- web-routes-0.27.9
+- web-routes-boomerang-0.28.4
+- web-routes-happstack-0.23.9
+- web-routes-th-0.22.3
+resolver: lts-3.10