From ce9d1fe54c7bf0087d4bfb8926bbf894a6322cb9 Mon Sep 17 00:00:00 2001
From: "Collin J. Doering" <collin@rekahsoft.ca>
Date: Sat, 20 May 2023 22:24:21 -0400
Subject: [PATCH] Update guix channels; make necessary adjustments (new ghc &
 clay)

* channels.scm (channel): Update all channels (guix and rekahsoft-guix)

* blog-rekahsoft-ca.cabal (cabal-version): Adjust base version now that ghc version 9.2.5 is in use; adjust clay to match ghc-clay package provided by updated guix channels.

* clay/*.hs: Adjust clay sources for api changes (swapping of function parameter order for
functions provided by the 'Clay.Border' module)
---
 blog-rekahsoft-ca.cabal |  6 +++---
 channels.scm            |  4 ++--
 clay/Header.hs          |  6 +++---
 clay/PageComponents.hs  | 20 ++++++++++----------
 clay/Util.hs            |  2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/blog-rekahsoft-ca.cabal b/blog-rekahsoft-ca.cabal
index edb0052..c3772e5 100644
--- a/blog-rekahsoft-ca.cabal
+++ b/blog-rekahsoft-ca.cabal
@@ -61,7 +61,7 @@ executable blog-rekahsoft-ca
   other-extensions:    OverloadedStrings, TupleSections, FlexibleContexts
   
   -- Other library packages from which modules are imported.
-  build-depends:       base >=4.14 && <4.15,
+  build-depends:       base >=4.16 && <4.17,
                        hakyll >= 4.15 && <4.16,
                        pandoc >= 1.13,
                        parsec >= 3.1,
@@ -89,8 +89,8 @@ executable gencss
   other-extensions:    OverloadedStrings
   
   -- Other library packages from which modules are imported.
-  build-depends:       base >=4.14 && <4.15,
-                       clay >=0.13 && <0.14,
+  build-depends:       base >=4.16 && <4.17,
+                       clay >=0.14 && <0.15,
                        text >=1.2 && <1.3
   
   -- Directories containing source files.
diff --git a/channels.scm b/channels.scm
index fc0c24f..4f28b20 100644
--- a/channels.scm
+++ b/channels.scm
@@ -2,7 +2,7 @@
         (name 'guix)
         (url "https://git.savannah.gnu.org/git/guix.git")
         (commit
-          "15404ff19b304bc9efcdb9a326318fb9fa9716da")
+          "a4e9842a70775a54bbe1369881b739e7ea9a6432")
         (introduction
           (make-channel-introduction
             "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -12,7 +12,7 @@
         (name 'rekahsoft-guix)
         (url "https://git.rekahsoft.ca/rekahsoft/rekahsoft-guix.git")
         (commit
-          "9915757715c96e0643bd5bd0dff466a1d9c652a7")
+          "58deed23414b5c7e82fc415ad06d15f39a2dfa56")
         (introduction
           (make-channel-introduction
             "191cdaa0947657e0c85fe89ebbb8e7b1e7a8e0a4"
diff --git a/clay/Header.hs b/clay/Header.hs
index 4e914d0..6e6f88d 100644
--- a/clay/Header.hs
+++ b/clay/Header.hs
@@ -55,7 +55,7 @@ navigation = do
     (backgroundPosition $ positioned (px 304) nil)
 
   "#nav" ? do
-    border solid (px 2) black
+    border (px 2) solid black
     borderRightWidth 0
     borderLeftWidth 0
     backgroundImage $ url "/images/diagonal-stripes.png"
@@ -126,8 +126,8 @@ statusMessage :: Css
 statusMessage = do
   "#status" ? do
     display none
-    border solid (px 1) black
-    borderTop solid nil black
+    border (px 1) solid black
+    borderTop nil solid black
     borderBottomRightRadius (px 5) (px 5)
     borderBottomLeftRadius (px 5) (px 5)
     backgroundColor $ rgb 146 208 240
diff --git a/clay/PageComponents.hs b/clay/PageComponents.hs
index 91b0ec6..1094f51 100644
--- a/clay/PageComponents.hs
+++ b/clay/PageComponents.hs
@@ -50,7 +50,7 @@ aPost = do
 
     header ? do
       marginBottom (em 0.8)
-      border solid (px 2) "#eee"
+      border (px 2) solid "#eee"
       sym borderRadius (px 3)
       sym padding (em 0.35)
       paddingLeft (px 65)
@@ -84,7 +84,7 @@ aPost = do
 
     footer ? do
       padding (em 0.75) nil (em 0.25) nil
-      borderTop solid (px 1) "#eee"
+      borderTop (px 1) solid "#eee"
 
       ".read-more" ? fontWeight bold
       ".no-teaser" ? do
@@ -122,7 +122,7 @@ aPost = do
 businessCard :: Css
 businessCard = do
   "#business-card" ? do
-    border solid (px 2) black
+    border (px 2) solid black
     sym borderRadius (px 5)
     sym padding (px 10)
     minHeight (px 215)
@@ -133,7 +133,7 @@ businessCard = do
       backgroundImage $ url "/images/business-card.png"
       backgroundSize cover
       backgroundPosition $ placed sideCenter sideCenter
-      border solid (px 1) black
+      border (px 1) solid black
       sym borderRadius (px 10)
       minHeight (px 215)
       minWidth (px 150)
@@ -141,7 +141,7 @@ businessCard = do
       marginRight (px 10)
 
     ".info" ? do
-      borderTop solid (px 2) black
+      borderTop (px 2) solid black
       overflow hidden
       paddingTop (px 8)
     
@@ -185,11 +185,11 @@ srcCodeBlock = do
     <> table # ".sourceCode" ** pre ? do
       sym margin nil
       sym padding nil
-      border none nil black
+      border nil none black
       verticalAlign vAlignBaseline
 
   td # ".lineNumbers" ? do
-    borderRight solid (px 1) "#AAAAAA"
+    borderRight (px 1) solid "#AAAAAA"
     textAlign $ alignSide sideRight
     color "#AAAAAA"
     paddingLeft (px 8)
@@ -222,7 +222,7 @@ srcCodeBlock = do
 postFigures :: Css
 postFigures = do
   figure ? do
-    border solid (px 1) black
+    border (px 1) solid black
     sym borderRadius (px 3)
     clear both
 
@@ -230,7 +230,7 @@ postFigures = do
     img <? do
       display block
       width (pct 100)
-      borderBottom solid (px 1) black
+      borderBottom (px 1) solid black
       cursor pointer
 
     figcaption # ":before" <? do
@@ -249,7 +249,7 @@ inlinePostImages = article # ".post" ? do
     clear clearRight
     float floatRight
     width (pct 30)
-    border solid (px 1) black
+    border (px 1) solid black
     sym borderRadius (px 3)
     sym margin (em 1)
     cursor pointer
diff --git a/clay/Util.hs b/clay/Util.hs
index 34191eb..39081d5 100644
--- a/clay/Util.hs
+++ b/clay/Util.hs
@@ -32,7 +32,7 @@ makeBorderBox pad backCol =
       backCol' = fromMaybe (rgba 250 250 255 165) backCol
   in do
     backgroundColor backCol'
-    border solid (px 1) "#888"
+    border (px 1) solid "#888"
     borderRadius (px 5) (px 5) (px 5) (px 5)
 --    boxShadow (px 2) (px 5) (px 2) "#888"
     sym padding pad'