diff --git a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/Base.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/Base.hs @@ -1,5 +1,5 @@ -- Base.hs: OpenPGP (RFC4880) data types --- Copyright © 2012-2021 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE CPP #-} @@ -45,7 +45,6 @@ import qualified Data.Set as Set import Data.Text (Text) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (Pretty(..), (<+>), hsep, punctuate, space) import Data.Time.Clock.POSIX (posixSecondsToUTCTime) import Data.Time.Format (formatTime) import Data.Time.Locale.Compat (defaultTimeLocale) @@ -53,6 +52,7 @@ import Data.Word (Word16, Word32, Word8) import Network.URI (URI(..), nullURI, parseURI, uriToString) import Numeric (readHex) +import Prettyprinter (Pretty(..), (<+>), hsep, punctuate, space) type Exportability = Bool diff --git a/Codec/Encryption/OpenPGP/Types/Internal/CryptoniteNewtypes.hs b/Codec/Encryption/OpenPGP/Types/Internal/CryptoniteNewtypes.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/CryptoniteNewtypes.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/CryptoniteNewtypes.hs @@ -1,5 +1,5 @@ -- CryptoniteNewtypes.hs: OpenPGP (RFC4880) newtype wrappers for some cryptonite types --- Copyright © 2012-2018 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE DeriveDataTypeable #-} @@ -17,8 +17,8 @@ import qualified Data.Aeson as A import Data.Data (Data) import Data.Hashable (Hashable(..)) -import Data.Text.Prettyprint.Doc (Pretty(..), (<+>), tupled) import Data.Typeable (Typeable) +import Prettyprinter (Pretty(..), (<+>), tupled) newtype DSA_PublicKey = DSA_PublicKey diff --git a/Codec/Encryption/OpenPGP/Types/Internal/PKITypes.hs b/Codec/Encryption/OpenPGP/Types/Internal/PKITypes.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/PKITypes.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/PKITypes.hs @@ -1,5 +1,5 @@ -- PKITypes.hs: OpenPGP (RFC4880) data types for public/secret keys --- Copyright © 2012-2019 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE DataKinds #-} @@ -23,9 +23,9 @@ import Data.Data (Data) import Data.Hashable (Hashable(..)) import Data.Ord (comparing) -import Data.Text.Prettyprint.Doc (Pretty(..), (<+>)) import Data.Typeable (Typeable) import Data.Word (Word16) +import Prettyprinter (Pretty(..), (<+>)) data EdSigningCurve = Ed25519 diff --git a/Codec/Encryption/OpenPGP/Types/Internal/PacketClass.hs b/Codec/Encryption/OpenPGP/Types/Internal/PacketClass.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/PacketClass.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/PacketClass.hs @@ -1,5 +1,5 @@ -- PacketClass.hs: OpenPGP (RFC4880) data types --- Copyright © 2012-2018 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE DataKinds #-} @@ -22,12 +22,13 @@ import Data.Data (Data) import Data.List.NonEmpty (NonEmpty) import Data.Text (Text) -import Data.Text.Prettyprint.Doc (Pretty(..)) import Data.Typeable (Typeable) import Data.Word (Word8) +import qualified Data.Kind +import Prettyprinter (Pretty(..)) class Packet a where - data PacketType a :: * + data PacketType a :: Data.Kind.Type packetType :: a -> PacketType a packetCode :: PacketType a -> Word8 toPkt :: a -> Pkt diff --git a/Codec/Encryption/OpenPGP/Types/Internal/Pkt.hs b/Codec/Encryption/OpenPGP/Types/Internal/Pkt.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/Pkt.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/Pkt.hs @@ -1,5 +1,5 @@ -- Pkt.hs: OpenPGP (RFC4880) Pkt data types --- Copyright © 2012-2021 Clint Adams +-- Copyright © 2012-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). {-# LANGUAGE DataKinds #-} @@ -30,9 +30,9 @@ import Data.Ord (comparing) import Data.Text (Text) import qualified Data.Text as T -import Data.Text.Prettyprint.Doc (Pretty(..), (<+>)) import Data.Typeable (Typeable) import Data.Word (Word8) +import Prettyprinter (Pretty(..), (<+>)) -- data Pkt = forall a. (Packet a, Show a, Eq a) => Pkt a data Pkt diff --git a/Codec/Encryption/OpenPGP/Types/Internal/PrettyUtils.hs b/Codec/Encryption/OpenPGP/Types/Internal/PrettyUtils.hs --- a/Codec/Encryption/OpenPGP/Types/Internal/PrettyUtils.hs +++ b/Codec/Encryption/OpenPGP/Types/Internal/PrettyUtils.hs @@ -1,5 +1,5 @@ -- PrettyUtils.hs: prettyprinter helpers --- Copyright © 2018 Clint Adams +-- Copyright © 2018-2022 Clint Adams -- This software is released under the terms of the Expat license. -- (See the LICENSE file). module Codec.Encryption.OpenPGP.Types.Internal.PrettyUtils where @@ -7,7 +7,7 @@ import qualified Data.ByteString.Lazy as BL import Data.Text.Encoding (decodeUtf8With) import Data.Text.Encoding.Error (lenientDecode) -import Data.Text.Prettyprint.Doc (Doc, Pretty(..)) +import Prettyprinter (Doc, Pretty(..)) prettyBS = pretty . decodeUtf8With lenientDecode diff --git a/hOpenPGP.cabal b/hOpenPGP.cabal --- a/hOpenPGP.cabal +++ b/hOpenPGP.cabal @@ -1,6 +1,6 @@ Cabal-version: 2.2 Name: hOpenPGP -Version: 2.9.7 +Version: 2.9.8 Synopsis: native Haskell implementation of OpenPGP (RFC4880) Description: native Haskell implementation of OpenPGP (RFC4880), plus Camellia (RFC5581), plus ECC (RFC6637) Homepage: https://salsa.debian.org/clint/hOpenPGP @@ -8,7 +8,7 @@ License-file: LICENSE Author: Clint Adams Maintainer: Clint Adams -Copyright: 2012-2021 Clint Adams +Copyright: 2012-2022 Clint Adams Category: Codec, Data Build-type: Simple Extra-source-files: tests/suite.hs @@ -181,7 +181,7 @@ , monad-loops , nettle , network-uri >= 2.6 - , prettyprinter + , prettyprinter >= 1.7.0 , resourcet > 0.4 , split , text @@ -285,4 +285,4 @@ source-repository this type: git location: https://salsa.debian.org/clint/hOpenPGP.git - tag: v2.9.7 + tag: v2.9.8