Upgrade LTS from 5.13 to 6.5

src/Darcs/Local/Repository.hs

@@ -21,7 +21,7 @@ where
 
 import Prelude
 
-import Storage.Hashed.Hash
+import Darcs.Util.Hash
 import System.Directory (createDirectory)
 import System.Exit (ExitCode (..))
 import System.FilePath ((</>))

src/Vervis/Darcs.hs

@@ -25,6 +25,9 @@ import Prelude hiding (lookup)
 import Control.Applicative ((<|>))
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.Trans.Except (ExceptT (ExceptT), runExceptT)
+import Darcs.Util.Path
+import Darcs.Util.Tree
+import Darcs.Util.Tree.Hashed
 import Data.Bool (bool)
 import Data.Maybe (listToMaybe, mapMaybe)
 import Data.Text (Text)
@@ -32,9 +35,6 @@ import Data.Text.Encoding (encodeUtf8, decodeUtf8With)
 import Data.Text.Encoding.Error (strictDecode)
 import Data.Time.Clock (getCurrentTime, diffUTCTime)
 import Data.Traversable (for)
-import Storage.Hashed.AnchoredPath
-import Storage.Hashed.Darcs
-import Storage.Hashed.Tree
 import System.FilePath ((</>))
 
 import qualified Data.ByteString.Lazy as BL (ByteString)

stack.yaml

@@ -3,7 +3,7 @@
 
 # Specifies the GHC version and set of packages available (e.g., lts-3.5,
 # nightly-2015-09-21, ghc-7.10.2)
-resolver: lts-5.13
+resolver: lts-6.5
 
 # Local packages, usually specified by relative directory name
 packages:
@@ -16,6 +16,7 @@ packages:
 # Packages to be pulled from upstream that are not in the resolver (e.g.,
 # acme-missiles-0.3)
 extra-deps:
+  - diagrams-svg-1.4.0.2
   - highlighter2-0.2.5
   - hit-graph-0.1
   - hit-harder-0.1

vervis.cabal

@@ -201,9 +201,9 @@ library
                        -- for Data.Paginate.Local
                      , data-default-class
                        -- for drawing DAGs: RBAC role inheritance, etc.
-                     , diagrams-core
+                       , diagrams-core
-                       -- for drawing DAGs: RBAC role inheritance, etc.
+                       , diagrams-lib
-                     , diagrams-lib
+                       , diagrams-svg
                      , directory
                        -- for Data.Git.Local
                      , directory-tree
@@ -251,9 +251,11 @@ library
                      , resourcet
                      , safe
                      , shakespeare
+                     , ssh
+                       -- for rendering diagrams
+                     , svg-builder
                        -- for text drawing in 'diagrams'
                      , SVGFonts
-                     , ssh
                      , template-haskell
                      , text
                      , time