From bc0b45bb7d6f9ffe7e70ba64b89ecf920eac4c15 Mon Sep 17 00:00:00 2001 From: Mike Pilgrem Date: Wed, 27 Sep 2023 23:42:02 +0100 Subject: [PATCH] Bump to rio-prettyprint-0.1.7.0 --- ChangeLog.md | 4 ++++ int/Pantry/Types.hs | 7 ++----- package.yaml | 2 +- pantry.cabal | 10 +++++----- src/Pantry.hs | 3 ++- stack-ghc-9.2.8.yaml | 2 +- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index af6f5d8e..91a61d10 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Changelog for pantry +## v0.9.2.1 + +* Depend on `rio-prettyprint-0.1.7.0`. + ## v0.9.2 * `defaultCasaRepoPrefix` references https://casa.stackage.org, instead of diff --git a/int/Pantry/Types.hs b/int/Pantry/Types.hs index 623f9e7a..0585420e 100644 --- a/int/Pantry/Types.hs +++ b/int/Pantry/Types.hs @@ -188,8 +188,8 @@ import qualified RIO.Text as T import RIO.Time ( Day, UTCTime, toGregorian ) import qualified RIO.Map as Map import RIO.PrettyPrint - ( bulletedList, fillSep, flow, hang, line, mkNarrativeList - , parens, string, style + ( blankLine, bulletedList, fillSep, flow, hang, line + , mkNarrativeList, parens, string, style ) import RIO.PrettyPrint.Types ( Style (..) ) import Text.PrettyPrint.Leijen.Extended ( Pretty (..), StyleDoc ) @@ -1962,9 +1962,6 @@ instance Pretty PantryException where <> blankLine <> string (displayException err) -blankLine :: StyleDoc -blankLine = line <> line - data FuzzyResults = FRNameNotFound ![PackageName] | FRVersionNotFound !(NonEmpty PackageIdentifierRevision) diff --git a/package.yaml b/package.yaml index da9ad123..e1536795 100644 --- a/package.yaml +++ b/package.yaml @@ -59,7 +59,7 @@ dependencies: - resourcet - rio - rio-orphans -- rio-prettyprint >= 0.1.4.0 +- rio-prettyprint >= 0.1.7.0 - static-bytes - tar-conduit >= 0.4.0 - text diff --git a/pantry.cabal b/pantry.cabal index ac9a42fd..ef1015ff 100644 --- a/pantry.cabal +++ b/pantry.cabal @@ -1,6 +1,6 @@ cabal-version: 2.0 --- This file has been generated from package.yaml by hpack version 0.35.5. +-- This file has been generated from package.yaml by hpack version 0.36.0. -- -- see: https://github.com/sol/hpack @@ -90,7 +90,7 @@ library , resourcet , rio , rio-orphans - , rio-prettyprint >=0.1.4.0 + , rio-prettyprint >=0.1.7.0 , static-bytes , tar-conduit >=0.4.0 , text @@ -168,7 +168,7 @@ library internal , resourcet , rio , rio-orphans - , rio-prettyprint >=0.1.4.0 + , rio-prettyprint >=0.1.7.0 , static-bytes , tar-conduit >=0.4.0 , text @@ -234,7 +234,7 @@ executable test-pretty-exceptions , resourcet , rio , rio-orphans - , rio-prettyprint >=0.1.4.0 + , rio-prettyprint >=0.1.7.0 , static-bytes , tar-conduit >=0.4.0 , text @@ -335,7 +335,7 @@ test-suite spec , resourcet , rio , rio-orphans - , rio-prettyprint >=0.1.4.0 + , rio-prettyprint >=0.1.7.0 , static-bytes , tar-conduit >=0.4.0 , text diff --git a/src/Pantry.hs b/src/Pantry.hs index 8aeda486..33d70dd4 100644 --- a/src/Pantry.hs +++ b/src/Pantry.hs @@ -240,8 +240,9 @@ import RIO.Directory ( getAppUserDataDirectory ) import qualified RIO.FilePath as FilePath import qualified RIO.List as List import qualified RIO.Map as Map -import RIO.PrettyPrint +import RIO.PrettyPrint ( HasTerm (..) ) import RIO.PrettyPrint.StylesUpdate + ( HasStylesUpdate (..), StylesUpdate ) import RIO.Process import qualified RIO.Set as Set import RIO.Text ( unpack ) diff --git a/stack-ghc-9.2.8.yaml b/stack-ghc-9.2.8.yaml index 1a15e5e9..4b02dbc5 100644 --- a/stack-ghc-9.2.8.yaml +++ b/stack-ghc-9.2.8.yaml @@ -20,7 +20,7 @@ packages: # lts-20.26 provides http-download-0.2.0.0 - http-download-0.2.1.0@sha256:a97863e96f7d44efc3d0e3061db7fe2540b8374ca44ae90d0b56040140cb7506,1716 # lts-20.26 provides rio-prettyprint-0.1.3.0 -- rio-prettyprint-0.1.6.0@sha256:13f414dd5beb9f433867f4cdebb58c7456d61595f4f3f98eba3b125a0b9c127c,1358 +- rio-prettyprint-0.1.7.0@sha256:4f0f2dabcbc3be1f9871de7c2ff3d090b82462ca5924afa24f7b2540c5511d84,1428 - static-bytes-0.1.0@sha256:35dbf30f617baa0151682c97687042516be07872a39984f9fe31f78125b962bf,1627 # lts-20.26 provides tar-conduit-0.3.2 - tar-conduit-0.4.0@sha256:f333649770f5ec42a83a93b0d424cf6bb895d80dfbee05a54340395f81d036ae,3126