Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump to rio-prettyprint-0.1.7.0 #110

Merged
merged 1 commit into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 2 additions & 5 deletions int/Pantry/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -1962,9 +1962,6 @@ instance Pretty PantryException where
<> blankLine
<> string (displayException err)

blankLine :: StyleDoc
blankLine = line <> line

data FuzzyResults
= FRNameNotFound ![PackageName]
| FRVersionNotFound !(NonEmpty PackageIdentifierRevision)
Expand Down
2 changes: 1 addition & 1 deletion package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions pantry.cabal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion src/Pantry.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-9.2.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down