From 972ebc793e42d7caf69adf989b0d4c70b5599b15 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin.doering@rekahsoft.ca>
Date: Sat, 4 Nov 2017 22:36:04 -0400
Subject: [PATCH] Resolve dependency issues after package and ghc 8.2 upgrade

Signed-off-by: Collin J. Doering <collin.doering@rekahsoft.ca>
---
 .gitlab-ci.yml          |  2 +-
 blog-rekahsoft-ca.cabal | 14 +++++++-------
 clay/PageComponents.hs  |  2 +-
 clay/Util.hs            |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3a3b429..f521b83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,7 @@ variables:
 
 build:
   stage: build
-  image: haskell:8.0.2
+  image: haskell:8.2
   artifacts:
     name: "${CI_PROJECT_NAME}__${CI_COMMIT_TAG}__${CI_COMMIT_REF_NAME}__${CI_COMMIT_SHA}"
     paths:
diff --git a/blog-rekahsoft-ca.cabal b/blog-rekahsoft-ca.cabal
index ef07865..90b35bf 100644
--- a/blog-rekahsoft-ca.cabal
+++ b/blog-rekahsoft-ca.cabal
@@ -61,8 +61,8 @@ executable blog-rekahsoft-ca
   other-extensions:    OverloadedStrings, TupleSections, FlexibleContexts
   
   -- Other library packages from which modules are imported.
-  build-depends:       base >=4.9 && <4.10,
-                       hakyll >= 4.7,
+  build-depends:       base >=4.10 && <4.11,
+                       hakyll >= 4.9 && <4.10,
                        pandoc >= 1.13,
                        parsec >= 3.1,
                        filepath >= 1.3,
@@ -83,14 +83,14 @@ executable gencss
   Ghc-options:         -Wall -O2
 
   -- Modules included in this executable, other than Main.
-  -- other-modules:       
+  other-modules: Header PageComponents Util
   
   -- LANGUAGE extensions used by modules in this package.
   other-extensions:    OverloadedStrings
   
   -- Other library packages from which modules are imported.
-  build-depends:       base >=4.9 && <4.10,
-                       clay >=0.10 && <0.11,
+  build-depends:       base >=4.10 && <4.11,
+                       clay >=0.12 && <0.13,
                        text >=1.2 && <1.3
   
   -- Directories containing source files.
@@ -104,12 +104,12 @@ Test-Suite test-site
   main-is:             Main.hs
   Ghc-options:         -Wall -O2 -threaded
   hs-source-dirs:      src, test
-  build-depends:       base >=4.9 && <4.10,
+  build-depends:       base >=4.10 && <4.11,
                        hspec >= 2.1,
                        hspec-webdriver >= 1.0,
                        webdriver >= 0.6,
                        process >= 1.2,
                        directory >= 1.2,
-                       text >= 1.2,
+                       text >= 1.2 && <1.3,
                        filepath >= 1.3
   default-language:    Haskell2010
diff --git a/clay/PageComponents.hs b/clay/PageComponents.hs
index c274ee6..49ebd92 100644
--- a/clay/PageComponents.hs
+++ b/clay/PageComponents.hs
@@ -184,7 +184,7 @@ srcCodeBlock = do
       sym margin nil
       sym padding nil
       border none nil black
-      verticalAlign baseline
+      verticalAlign vAlignBaseline
 
   td # ".lineNumbers" ? do
     borderRight solid (px 1) "#AAAAAA"
diff --git a/clay/Util.hs b/clay/Util.hs
index 5c603ea..04132b8 100644
--- a/clay/Util.hs
+++ b/clay/Util.hs
@@ -26,7 +26,7 @@ import Clay hiding (i, s, id)
 import Data.Maybe (fromMaybe)
 import Prelude hiding (div, span, (**))
 
-makeBorderBox :: Maybe (Size Abs) -> Maybe Color -> Css
+makeBorderBox :: Maybe (Size LengthUnit) -> Maybe Color -> Css
 makeBorderBox pad backCol =
   let pad' = fromMaybe (px 8) pad
       backCol' = fromMaybe (rgba 250 250 255 165) backCol