From 1e7c13412d2e7775ee55df57f6eee09eae1d3dee Mon Sep 17 00:00:00 2001 From: justin Date: Wed, 27 Dec 2023 17:32:48 +0000 Subject: [PATCH] migrate to 9.6.3 --- app/migrate-entries.hs | 2 +- app/site.hs | 2 +- flake.nix | 6 +++--- inCode.cabal | 2 +- src/Blog/App.hs | 2 +- src/Blog/Compiler/Tag.hs | 2 +- src/Blog/Rule/Archive.hs | 2 +- src/Blog/View/Home.hs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/migrate-entries.hs b/app/migrate-entries.hs index d2c134a2d..04fa04120 100644 --- 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 index 7ec84ef7e..da8fc53ca 100644 --- 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 index 2e2ec5a3b..cc8fcbb05 100644 --- 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 index b679f9cae..2db21caaa 100644 --- 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 index 1baf1886b..0c9454612 100644 --- 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 index 6cc98bf5f..8a9993312 100644 --- 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 index 8e69534bf..72f4b435d 100644 --- 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 index 1a5e6f6b0..4bc7ce967 100644 --- 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