From 68e77c9337892db86e6da0c88991a991d2b50d1c Mon Sep 17 00:00:00 2001
From: Lennart Spitzner <lsp@informatik.uni-kiel.de>
Date: Sun, 14 May 2017 19:27:16 +0200
Subject: [PATCH] Fixup for czipwith and Update stack.yaml

---
 brittany.cabal       | 1 +
 src-brittany/Main.hs | 6 ++++--
 stack.yaml           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/brittany.cabal b/brittany.cabal
index 773560a..a7740a0 100644
--- a/brittany.cabal
+++ b/brittany.cabal
@@ -151,6 +151,7 @@ executable brittany
     , filepath >=1.4.1.0 && <1.5
     , either
     , ghc-boot-th
+    , czipwith
     }
   hs-source-dirs:      src-brittany
   default-language:    Haskell2010
diff --git a/src-brittany/Main.hs b/src-brittany/Main.hs
index da91ae8..f2a3018 100644
--- a/src-brittany/Main.hs
+++ b/src-brittany/Main.hs
@@ -14,6 +14,8 @@ import qualified Data.Map as Map
 
 import qualified Data.Text.Lazy.Builder as Text.Builder
 
+import           Data.CZipWith
+
 import qualified Debug.Trace as Trace
 
 import           Language.Haskell.Brittany.Types
@@ -220,7 +222,7 @@ mainCmdParser helpDesc = do
       then trace "----"
       else id
 
-readConfigs :: ConfigF Option -> [System.IO.FilePath] -> MaybeT IO Config
+readConfigs :: CConfig Option -> [System.IO.FilePath] -> MaybeT IO Config
 readConfigs cmdlineConfig configPaths = do
   let defLocalConfigPath = "brittany.yaml"
   userBritPath <- liftIO $ Directory.getAppUserDataDirectory "brittany"
@@ -235,4 +237,4 @@ readConfigs cmdlineConfig configPaths = do
     paths -> foldl (\prev p -> prev >>= readMergePersConfig p False)
                    (return cmdlineConfig)
                    paths
-  return $ cZip fromOptionIdentity staticDefaultConfig merged
+  return $ cZipWith fromOptionIdentity staticDefaultConfig merged
diff --git a/stack.yaml b/stack.yaml
index 3331819..daf07fa 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -3,6 +3,7 @@ resolver: lts-8.4
 extra-deps:
   - monad-memo-0.4.1
   - unsafe-0.0
+  - czipwith-1.0.0.0
 
 packages:
   - .