From d9b32e76ef1ada2f4395421262c680f5af188564 Mon Sep 17 00:00:00 2001 From: Artyom Date: Mon, 22 May 2017 13:09:39 +0300 Subject: [PATCH] [#158] Bump LTS version to 8.13 --- guide.cabal | 8 ++++---- src/Guide/Utils.hs | 6 ++++-- stack.yaml | 8 +++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/guide.cabal b/guide.cabal index 4d3646d..2c7129f 100644 --- a/guide.cabal +++ b/guide.cabal @@ -75,7 +75,7 @@ library build-depends: Spock , Spock-lucid == 0.3.* , acid-state == 0.14.* - , aeson == 0.11.* + , aeson == 1.0.* , aeson-pretty , base >=4.9 && <4.10 , base-prelude @@ -101,11 +101,12 @@ library , fsnotify == 0.2.* , hashable , haskell-src-meta + , http-api-data , http-types , ilist , iproute == 1.7.* , lucid >= 2.9.5 && < 3 - , megaparsec == 5.0.* + , megaparsec == 5.* , microlens-platform >= 0.3.2 , mmorph == 1.* , mtl >= 2.1.1 @@ -113,7 +114,6 @@ library , network , network-uri , patches-vector - , path-pieces , random >= 1.1 , reroute , safecopy @@ -160,7 +160,7 @@ test-suite tests MergeSpec Selenium type: exitcode-stdio-1.0 - build-depends: QuickCheck < 2.9 + build-depends: QuickCheck < 2.10 , base < 5 , base-prelude , cmark diff --git a/src/Guide/Utils.hs b/src/Guide/Utils.hs index e60ce45..280112f 100644 --- a/src/Guide/Utils.hs +++ b/src/Guide/Utils.hs @@ -96,7 +96,7 @@ import Data.IP import Lucid hiding (for_) import Web.Spock as Spock import Text.HTML.SanitizeXSS (sanitaryURI) -import Web.PathPieces +import Web.HttpApiData import qualified Network.Wai as Wai -- Feeds import qualified Text.Atom.Feed as Atom @@ -234,7 +234,9 @@ sockAddrToIP _ = Nothing -- | Unique id, used for many things – categories, items, and anchor ids. newtype Uid a = Uid {uidToText :: Text} - deriving (Eq, Ord, Show, PathPiece, T.Buildable, Hashable, A.ToJSON) + deriving (Eq, Ord, Show, + ToHttpApiData, FromHttpApiData, + T.Buildable, Hashable, A.ToJSON) -- This instance is written manually because otherwise it produces a warning: -- • Redundant constraint: SafeCopy a diff --git a/stack.yaml b/stack.yaml index 0c87c86..3f0952f 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,15 +1,13 @@ -resolver: lts-7.9 +resolver: lts-8.13 packages: - location: . - location: git: https://github.com/aelve/stache-plus - commit: e8e7967d561148167eb1fe4112c6ad0e091490ab + commit: 789aeabbf8069dec80647160f127d047e8f5a330 extra-dep: true extra-deps: -- cmark-sections-0.1.0.2 -- http-client-0.5.1 -- edit-distance-vector-1.0.0.4 +- cmark-sections-0.1.0.3 - patches-vector-0.1.5.4 - fmt-0.2.0.0