migrate to 9.6.3

mstksg · Dec 27, 2023 · 1e7c134 · 1e7c134
1 parent b2e6cc5
commit 1e7c134
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/app/migrate-entries.hs b/app/migrate-entries.hs
@@ -7,7 +7,7 @@ import           Control.Monad
 import           Control.Monad.Trans.State
 import           Data.Default
 import           Data.Foldable
-import           Data.List
+import           Data.List (intercalate, isPrefixOf)
 import           Data.Maybe
 import           Data.Scientific
 import           Options.Applicative

diff --git a/app/site.hs b/app/site.hs
@@ -22,7 +22,7 @@ main :: IO ()
 main = do
     znow <- getZonedTime
 
-    c@Config{..} <- input interpretConfig configPath
+    c <- input interpretConfig configPath
     let ?config = c
 
     PP.renderIO stdout

diff --git a/flake.nix b/flake.nix
@@ -14,13 +14,13 @@
             inCode = final.haskell-nix.project' {
               name = "inCode";
               src = ./.;
-              compiler-nix-name = "ghc884";
+              compiler-nix-name = "ghc963";
               shell = {
                 withHoogle = false;
                 tools = {
                   cabal = { };
-                  # hlint = { };
-                  # haskell-language-server = { };
+                  hlint = { };
+                  haskell-language-server = { };
                 };
               };
             };

diff --git a/inCode.cabal b/inCode.cabal
@@ -63,7 +63,7 @@ library
     , hakyll-sass
     , hjsmin
     , hsass
-    , inliterate
+    -- , inliterate
     , lens
     , pandoc
     , pandoc-types

diff --git a/src/Blog/App.hs b/src/Blog/App.hs
@@ -26,7 +26,7 @@ import           Control.Monad
 import           Control.Monad.Trans.Maybe
 import           Data.Default
 import           Data.Foldable
-import           Data.List
+import           Data.List (sortBy)
 import           Data.Maybe
 import           Data.Ord
 import           Data.Time.LocalTime

diff --git a/src/Blog/Compiler/Tag.hs b/src/Blog/Compiler/Tag.hs
@@ -8,7 +8,7 @@ import           Blog.Compiler.Archive
 import           Blog.Types
 import           Blog.Util
 import           Blog.Util.Tag
-import           Data.List
+import           Data.List (sortBy)
 import           Data.Maybe
 import           Data.String
 import           Hakyll

diff --git a/src/Blog/Rule/Archive.hs b/src/Blog/Rule/Archive.hs
@@ -8,7 +8,7 @@ import           Blog.Types
 import           Blog.Util
 import           Control.Monad
 import           Data.Maybe
-import           Data.Time.Calendar
+import           Data.Time.Calendar (toGregorian)
 import           Data.Time.LocalTime
 import           Hakyll
 import qualified Data.Map.Strict     as M

diff --git a/src/Blog/View/Home.hs b/src/Blog/View/Home.hs
@@ -13,7 +13,7 @@ import           Blog.View
 import           Blog.View.Social
 import           Control.Applicative
 import           Control.Monad
-import           Data.List
+import           Data.List (sortBy)
 import           Data.String
 import           Text.Blaze.Html5            ((!))
 import qualified Data.Map                    as M