Add support for base64-1.0

Author: TristanCacqueray

flake.nix

@@ -19,6 +19,7 @@
           (final: prev: {
             myHaskellPackages = prev.haskellPackages.override {
               overrides = hpFinal: hpPrev: {
+                base64 = hpPrev.base64_1_0;
                 matrix-client =
                   hpPrev.callCabal2nix "matrix-client" ./matrix-client/. { };
                 matrix-bot =

matrix-client/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.1.6.0
+
+- Support base64-1.0
+
 ## 0.1.5.0
 
 - Convert userDisplayName into a Maybe value [#30](https://github.com/softwarefactory-project/matrix-client-haskell/issues/30)

matrix-client/matrix-client.cabal

@@ -1,6 +1,6 @@
 cabal-version:       2.4
 name:                matrix-client
-version:             0.1.5.0
+version:             0.1.6.0
 synopsis:            A matrix client library
 description:
     Matrix client is a library to interface with https://matrix.org.
@@ -48,7 +48,7 @@ common common-options
 
 common lib-depends
   build-depends:       SHA                    ^>= 1.6
-                     , base64                 >= 0.4.2 && < 0.5
+                     , base64                 >= 1.0
                      , bytestring             >= 0.11.3 && < 0.13
                      , containers             >= 0.6.5 && < 0.8
                      , exceptions             >= 0.10.4 && < 0.11

matrix-client/src/Network/Matrix/Identity.hs

@@ -38,8 +38,9 @@ where
 
 import Control.Monad (mzero)
 import Data.Aeson (FromJSON (..), Value (Object, String), encode, object, (.:), (.=))
+import Data.Base64.Types (extractBase64)
 import Data.ByteString.Lazy (fromStrict)
-import Data.ByteString.Lazy.Base64.URL (encodeBase64Unpadded)
+import Data.ByteString.Lazy.Base64.URL (encodeBase64)
 import Data.Digest.Pure.SHA (bytestringDigest, sha256)
 #if MIN_VERSION_aeson(2,0,0)
 import qualified Data.Aeson.KeyMap as KeyMap
@@ -166,7 +167,7 @@ identitiesLookup session ilr = do
 -- >>> encodeSHA256 "[email protected] email matrixrocks"
 -- "4kenr7N9drpCJ4AfalmlGQVsOn3o2RHjkADUpXJWZUc"
 encodeSHA256 :: Text -> Text
-encodeSHA256 = toStrict . encodeBase64Unpadded . bytestringDigest . sha256 . fromStrict . encodeUtf8
+encodeSHA256 = toStrict . extractBase64 . encodeBase64 . bytestringDigest . sha256 . fromStrict . encodeUtf8
 
 data Identity = Email Text | Msisdn Text deriving (Show, Eq)