diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..05f692d --- /dev/null +++ b/shell.nix @@ -0,0 +1,8 @@ +with import { }; + +haskell.lib.buildStackProject { + name = "guide"; + inherit ghc; + buildInputs = [ git ncurses zlib ]; + LANG = "en_US.UTF-8"; +} diff --git a/src/Guide/Main.hs b/src/Guide/Main.hs index b93d2bc..0a08b83 100644 --- a/src/Guide/Main.hs +++ b/src/Guide/Main.hs @@ -53,7 +53,6 @@ import Data.Serialize.Get as Cereal -- IO import System.IO import qualified SlaveThread as Slave -import GHC.IO.Encoding (setLocaleEncoding, utf8) -- Catching signals import System.Posix.Signals -- Watching the templates directory @@ -137,8 +136,6 @@ lucidWithConfig x = do -- | Start the site. main :: IO () main = do - -- force to use UTF-8 - setLocaleEncoding utf8 config <- readConfig mainWith config diff --git a/stack.yaml b/stack.yaml index a614d1a..fc2b6ba 100644 --- a/stack.yaml +++ b/stack.yaml @@ -11,6 +11,9 @@ packages: commit: 26e5f8c7f62ebce66ef19e5bd573af21c16fe2b1 extra-dep: true +nix: + shell-file: shell.nix + extra-deps: - text-all-0.4.1.0 - cmark-sections-0.3.0 diff --git a/tests/Main.hs b/tests/Main.hs index 1309b15..0b0fc04 100644 --- a/tests/Main.hs +++ b/tests/Main.hs @@ -5,7 +5,6 @@ module Main (main) where import BasePrelude -import GHC.IO.Encoding (setLocaleEncoding, utf8) -- Testing import Test.Hspec @@ -17,8 +16,6 @@ import qualified MergeSpec main :: IO () main = do - -- force to use UTF-8 - setLocaleEncoding utf8 hspec $ do MarkdownSpec.tests MergeSpec.tests