rekahsoft
/
blog-rekahsoft-ca
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Resolve dependency issues after package and ghc 8.2 upgrade 

Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
This commit is contained in:
Collin J. Doering 2017-11-04 22:36:04 -04:00
parent 1a26f68e09
commit 972ebc793e
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -8,7 +8,7 @@ variables:
build: build:
stage: build stage: build
image: haskell:8.0.2 image: haskell:8.2
artifacts: artifacts:
name: "${CI_PROJECT_NAME}__${CI_COMMIT_TAG}__${CI_COMMIT_REF_NAME}__${CI_COMMIT_SHA}" name: "${CI_PROJECT_NAME}__${CI_COMMIT_TAG}__${CI_COMMIT_REF_NAME}__${CI_COMMIT_SHA}"
paths: paths:

14
blog-rekahsoft-ca.cabal
View File

@ -61,8 +61,8 @@ executable blog-rekahsoft-ca
other-extensions: OverloadedStrings, TupleSections, FlexibleContexts other-extensions: OverloadedStrings, TupleSections, FlexibleContexts
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
build-depends: base >=4.9 && <4.10, build-depends: base >=4.10 && <4.11,
hakyll >= 4.7, hakyll >= 4.9 && <4.10,
pandoc >= 1.13, pandoc >= 1.13,
parsec >= 3.1, parsec >= 3.1,
filepath >= 1.3, filepath >= 1.3,
@ -83,14 +83,14 @@ executable gencss
Ghc-options: -Wall -O2 Ghc-options: -Wall -O2
-- Modules included in this executable, other than Main. -- Modules included in this executable, other than Main.
-- other-modules: other-modules: Header PageComponents Util
-- LANGUAGE extensions used by modules in this package. -- LANGUAGE extensions used by modules in this package.
other-extensions: OverloadedStrings other-extensions: OverloadedStrings
-- Other library packages from which modules are imported. -- Other library packages from which modules are imported.
build-depends: base >=4.9 && <4.10, build-depends: base >=4.10 && <4.11,
clay >=0.10 && <0.11, clay >=0.12 && <0.13,
text >=1.2 && <1.3 text >=1.2 && <1.3
-- Directories containing source files. -- Directories containing source files.
@ -104,12 +104,12 @@ Test-Suite test-site
main-is: Main.hs main-is: Main.hs
Ghc-options: -Wall -O2 -threaded Ghc-options: -Wall -O2 -threaded
hs-source-dirs: src, test hs-source-dirs: src, test
build-depends: base >=4.9 && <4.10, build-depends: base >=4.10 && <4.11,
hspec >= 2.1, hspec >= 2.1,
hspec-webdriver >= 1.0, hspec-webdriver >= 1.0,
webdriver >= 0.6, webdriver >= 0.6,
process >= 1.2, process >= 1.2,
directory >= 1.2, directory >= 1.2,
text >= 1.2, text >= 1.2 && <1.3,
filepath >= 1.3 filepath >= 1.3
default-language: Haskell2010 default-language: Haskell2010

2
clay/PageComponents.hs
View File

@ -184,7 +184,7 @@ srcCodeBlock = do
sym margin nil sym margin nil
sym padding nil sym padding nil
border none nil black border none nil black
verticalAlign baseline verticalAlign vAlignBaseline
td # ".lineNumbers" ? do td # ".lineNumbers" ? do
borderRight solid (px 1) "#AAAAAA" borderRight solid (px 1) "#AAAAAA"

2
clay/Util.hs
View File

@ -26,7 +26,7 @@ import Clay hiding (i, s, id)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Prelude hiding (div, span, (**)) import Prelude hiding (div, span, (**))
makeBorderBox :: Maybe (Size Abs) -> Maybe Color -> Css makeBorderBox :: Maybe (Size LengthUnit) -> Maybe Color -> Css
makeBorderBox pad backCol = makeBorderBox pad backCol =
let pad' = fromMaybe (px 8) pad let pad' = fromMaybe (px 8) pad
backCol' = fromMaybe (rgba 250 250 255 165) backCol backCol' = fromMaybe (rgba 250 250 255 165) backCol