diff --git a/HOpenPGP/Tools/Common.hs b/HOpenPGP/Tools/Common.hs --- a/HOpenPGP/Tools/Common.hs +++ b/HOpenPGP/Tools/Common.hs @@ -1,5 +1,5 @@ -- Common.hs: hOpenPGP-tools common functions --- Copyright © 2012-2021 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -62,9 +62,9 @@ import Data.Data.Lens (biplate) import Data.Text (Text) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (Doc, (<+>), hardline, pretty) import Options.Applicative.Builder (auto, help, hidden, infoOption, long, short) import Options.Applicative.Types (Parser, ReadM(..)) +import Prettyprinter (Doc, (<+>), hardline, pretty) import Codec.Encryption.OpenPGP.KeyInfo (pubkeySize) import Control.Error.Util (hush) diff --git a/HOpenPGP/Tools/HKP.hs b/HOpenPGP/Tools/HKP.hs --- a/HOpenPGP/Tools/HKP.hs +++ b/HOpenPGP/Tools/HKP.hs @@ -1,5 +1,5 @@ -- HKP.hs: hOpenPGP key tool --- Copyright © 2016-2021 Clint Adams +-- Copyright © 2016-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -52,7 +52,6 @@ import Data.Data.Lens (biplate) import Data.Either (rights) import Data.Monoid ((<>), mempty) -import Data.Text.Prettyprint.Doc (pretty) import Data.Time.Clock.POSIX (getPOSIXTime) import HOpenPGP.Tools.TKUtils (processTK) import Network.HTTP.Client @@ -64,6 +63,7 @@ ) import Network.HTTP.Client.TLS (tlsManagerSettings) import Network.HTTP.Types.Status (ok200) +import Prettyprinter (pretty) data FetchValidationMethod = MatchPrimaryKeyFingerprint diff --git a/HOpenPGP/Tools/Parser.y b/HOpenPGP/Tools/Parser.y --- a/HOpenPGP/Tools/Parser.y +++ b/HOpenPGP/Tools/Parser.y @@ -15,7 +15,7 @@ import Control.Monad.Trans.Reader (ask, reader, Reader, withReader) import Data.List (isInfixOf) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (pretty) +import Prettyprinter (pretty) } diff --git a/dist/build/hkt/hkt-tmp/HOpenPGP/Tools/Parser.hs b/dist/build/hkt/hkt-tmp/HOpenPGP/Tools/Parser.hs --- a/dist/build/hkt/hkt-tmp/HOpenPGP/Tools/Parser.hs +++ b/dist/build/hkt/hkt-tmp/HOpenPGP/Tools/Parser.hs @@ -19,7 +19,7 @@ import Control.Monad.Trans.Reader (ask, reader, Reader, withReader) import Data.List (isInfixOf) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (pretty) +import Prettyprinter (pretty) import qualified Data.Array as Happy_Data_Array import qualified Data.Bits as Bits import qualified GHC.Exts as Happy_GHC_Exts diff --git a/dist/build/hop/hop-tmp/HOpenPGP/Tools/Parser.hs b/dist/build/hop/hop-tmp/HOpenPGP/Tools/Parser.hs --- a/dist/build/hop/hop-tmp/HOpenPGP/Tools/Parser.hs +++ b/dist/build/hop/hop-tmp/HOpenPGP/Tools/Parser.hs @@ -19,7 +19,7 @@ import Control.Monad.Trans.Reader (ask, reader, Reader, withReader) import Data.List (isInfixOf) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (pretty) +import Prettyprinter (pretty) import qualified Data.Array as Happy_Data_Array import qualified Data.Bits as Bits import qualified GHC.Exts as Happy_GHC_Exts diff --git a/dist/build/hot/hot-tmp/HOpenPGP/Tools/Parser.hs b/dist/build/hot/hot-tmp/HOpenPGP/Tools/Parser.hs --- a/dist/build/hot/hot-tmp/HOpenPGP/Tools/Parser.hs +++ b/dist/build/hot/hot-tmp/HOpenPGP/Tools/Parser.hs @@ -19,7 +19,7 @@ import Control.Monad.Trans.Reader (ask, reader, Reader, withReader) import Data.List (isInfixOf) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (pretty) +import Prettyprinter (pretty) import qualified Data.Array as Happy_Data_Array import qualified Data.Bits as Bits import qualified GHC.Exts as Happy_GHC_Exts diff --git a/hkt.hs b/hkt.hs --- a/hkt.hs +++ b/hkt.hs @@ -1,5 +1,5 @@ -- hkt.hs: hOpenPGP key tool --- Copyright © 2013-2021 Clint Adams +-- Copyright © 2013-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -105,9 +105,9 @@ import Options.Applicative.Extra (customExecParser, helper, hsubparser) import Options.Applicative.Types (Parser) -import Data.Text.Prettyprint.Convert.AnsiWlPprint (toAnsiWlPprint) -import Data.Text.Prettyprint.Doc ((<+>), fillSep, hardline, list, pretty) -import Data.Text.Prettyprint.Doc.Render.Text (hPutDoc, putDoc) +import Prettyprinter.Convert.AnsiWlPprint (toAnsiWlPprint) +import Prettyprinter.Render.Text (hPutDoc, putDoc) +import Prettyprinter ((<+>), fillSep, hardline, list, pretty) import System.IO (BufferMode(..), Handle, hFlush, hSetBuffering, stderr) grabMatchingKeysConduit :: diff --git a/hokey.hs b/hokey.hs --- a/hokey.hs +++ b/hokey.hs @@ -1,5 +1,5 @@ -- hokey.hs: hOpenPGP key tool --- Copyright © 2013-2021 Clint Adams +-- Copyright © 2013-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -105,8 +105,8 @@ , stdout ) -import Data.Text.Prettyprint.Convert.AnsiWlPprint (toAnsiWlPprint) -import Data.Text.Prettyprint.Doc +import Prettyprinter.Convert.AnsiWlPprint (toAnsiWlPprint) +import Prettyprinter ( Doc , (<+>) , annotate @@ -118,7 +118,7 @@ , list , pretty ) -import qualified Data.Text.Prettyprint.Doc.Render.Terminal as PPA +import qualified Prettyprinter.Render.Terminal as PPA linebreak = flatAlt line mempty diff --git a/hop.hs b/hop.hs --- a/hop.hs +++ b/hop.hs @@ -1,5 +1,5 @@ -- hop.hs: hOpenPGP-stateless OpenPGP (sop) tool --- Copyright © 2019-2021 Clint Adams +-- Copyright © 2019-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -115,8 +115,8 @@ import Options.Applicative.Extra (customExecParser, helper, hsubparser) import Options.Applicative.Types (Parser) -import Data.Text.Prettyprint.Convert.AnsiWlPprint (toAnsiWlPprint) -import Data.Text.Prettyprint.Doc +import Prettyprinter.Convert.AnsiWlPprint (toAnsiWlPprint) +import Prettyprinter ( (<+>) , fillSep , hardline @@ -124,7 +124,7 @@ , pretty , softline ) -import Data.Text.Prettyprint.Doc.Render.Text (hPutDoc, putDoc) +import Prettyprinter.Render.Text (hPutDoc, putDoc) import System.IO (BufferMode(..), Handle, hFlush, hSetBuffering, stderr, stdin) data Command diff --git a/hopenpgp-tools.cabal b/hopenpgp-tools.cabal --- a/hopenpgp-tools.cabal +++ b/hopenpgp-tools.cabal @@ -1,6 +1,6 @@ cabal-version: 2.2 name: hopenpgp-tools -version: 0.23.6 +version: 0.23.7 synopsis: hOpenPGP-based command-line tools description: command-line tools for performing some OpenPGP-related operations homepage: https://salsa.debian.org/clint/hOpenPGP-tools @@ -24,8 +24,8 @@ , hOpenPGP >= 2.9.5 && < 3 , lens , optparse-applicative >= 0.11.0 - , prettyprinter - , prettyprinter-convert-ansi-wl-pprint + , prettyprinter >= 1.7.0 + , prettyprinter-convert-ansi-wl-pprint >= 1.1.1 , text , transformers , yaml @@ -61,7 +61,7 @@ , http-types , memory , openpgp-asciiarmor >= 0.1 - , prettyprinter-ansi-terminal + , prettyprinter-ansi-terminal >= 1.1.2 , time , time-locale-compat default-language: Haskell2010 @@ -112,4 +112,4 @@ source-repository this type: git location: https://salsa.debian.org/clint/hopenpgp-tools.git - tag: hopenpgp-tools/0.23.6 + tag: hopenpgp-tools/0.23.7 diff --git a/hot.hs b/hot.hs --- a/hot.hs +++ b/hot.hs @@ -1,5 +1,5 @@ -- hot.hs: hOpenPGP Tool --- Copyright © 2012-2021 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- -- vim: softtabstop=4:shiftwidth=4:expandtab -- @@ -54,8 +54,8 @@ , stdout ) -import Data.Text.Prettyprint.Convert.AnsiWlPprint (toAnsiWlPprint) -import Data.Text.Prettyprint.Doc +import Prettyprinter.Convert.AnsiWlPprint (toAnsiWlPprint) +import Prettyprinter ( Pretty , (<+>) , group @@ -64,7 +64,7 @@ , pretty , softline ) -import Data.Text.Prettyprint.Doc.Render.Text (hPutDoc) +import Prettyprinter.Render.Text (hPutDoc) import Options.Applicative.Builder ( argument , command