Merge branch 'dev' into untyped-normal-order-reduction

plfa · Feb 28, 2024 · f459518 · f459518
2 parents 4e021f2 + 35022ae
commit f459518
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plfa.cabal b/plfa.cabal
@@ -36,7 +36,7 @@ executable builder
   main-is:       tools/Buildfile.hs
   build-depends:
     , base
-    , base64
+    , base64              >=1.0
     , bytestring
     , containers
     , data-default-class

diff --git a/tools/Buildfile.hs b/tools/Buildfile.hs
@@ -17,8 +17,9 @@ import Control.Monad (forM, forM_, unless, when, (>=>))
 import Control.Monad.Except (MonadError (throwError))
 import Control.Monad.IO.Class (MonadIO)
 import Control.Monad.State (evalState)
+import Data.Base64.Types qualified as Base64
 import Data.ByteString.Lazy qualified as LazyByteString
-import Data.ByteString.Lazy.Base64 qualified as LazyByteString
+import Data.ByteString.Lazy.Base64 qualified as Base64
 import Data.Default.Class (Default (def))
 import Data.Digest.Pure.SHA qualified as Digest (bytestringDigest, sha512)
 import Data.Either (fromRight, isRight)
@@ -234,7 +235,7 @@ main = do
             liftIO $ do
               stream <- LazyByteString.readFile src
               let digest = Digest.sha512 stream
-              return . Just $ "sha512-" <> LazyByteString.encodeBase64 (Digest.bytestringDigest digest)
+              return . Just $ "sha512-" <> Base64.extractBase64 (Base64.encodeBase64 (Digest.bytestringDigest digest))
       let ?getDigest = getDigest
 
       --------------------------------------------------------------------------------