bump for 8.6

Author: angerman

cabal.project

@@ -4,3 +4,13 @@ source-repository-package
     type: git
     location: https://github.com/ElvishJerricco/hackage-db.git
     tag: 84ca9fc75ad45a71880e938e0d93ea4bde05f5bd
+
+source-repository-package
+    type: git
+    location: https://github.com/galenhuntington/haskell-src-meta.git
+    tag: 109ee29d5fd0f4e23fdd2f80eb122d66341b64a9
+
+source-repository-package
+    type: git
+    location: https://github.com/haskell-nix/hnix.git
+    tag: 617d0867ab96c8f97b02c4524bd948d9f114005e

cabal2nix/Main.hs

@@ -16,7 +16,8 @@ import Data.String (fromString)
 import Cabal2Nix
 import Cabal2Nix.Util
 
-import Text.PrettyPrint.ANSI.Leijen (hPutDoc, Doc)
+import Data.Text.Prettyprint.Doc (Doc)
+import Data.Text.Prettyprint.Doc.Render.Text (hPutDoc)
 import System.IO
 import Distribution.Nixpkgs.Fetch
 import Control.Monad.IO.Class
@@ -32,7 +33,7 @@ import qualified Data.Text as T
 import qualified Data.Text.Encoding as T
 
 
-writeDoc :: FilePath -> Doc -> IO ()
+writeDoc :: FilePath -> Doc ann -> IO ()
 writeDoc file doc =
   do handle <- openFile file WriteMode
      hPutDoc handle doc

nix-tools.cabal

@@ -49,7 +49,7 @@ executable cabal-to-nix
                      , nix-tools
                      , filepath
                      , directory
-                     , ansi-wl-pprint
+                     , prettyprinter
   hs-source-dirs:      cabal2nix
   default-language:    Haskell2010
 
@@ -135,7 +135,7 @@ executable stack-to-nix
                      , text
                      , Cabal
                      , vector
-                     , ansi-wl-pprint
+                     , prettyprinter
                      , directory
                      , filepath
                      , extra

stack2nix/Main.hs

@@ -33,7 +33,8 @@ import Cabal2Nix hiding (Git)
 import qualified Cabal2Nix as C2N
 import Cabal2Nix.Util
 
-import Text.PrettyPrint.ANSI.Leijen (hPutDoc, Doc)
+import Data.Text.Prettyprint.Doc (Doc)
+import Data.Text.Prettyprint.Doc.Render.Text (hPutDoc)
 import System.IO
 import Data.List (isSuffixOf, isInfixOf, isPrefixOf)
 import Control.Applicative ((<|>))
@@ -248,7 +249,7 @@ main = print . prettyNix =<< stackexpr =<< execParser opts
          <> progDesc "Generate a nix expression from a stack.yaml file"
          <> header "stack-to-nix - a stack to nix converter" )
 
-writeDoc :: FilePath -> Doc -> IO ()
+writeDoc :: FilePath -> Doc ann -> IO ()
 writeDoc file doc =
   do handle <- openFile file WriteMode
      hPutDoc handle doc