From 90e8ed77cf4b462fe191e313c97db036fd26a360 Mon Sep 17 00:00:00 2001
From: Tom Ellis <tom-git@jaguarpaw.co.uk>
Date: Mon, 5 Feb 2024 11:34:57 +0000
Subject: [PATCH] Support base64-1.0

---
 src/Stan/Observation.hs | 14 ++++++++++++++
 stan.cabal              |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/Stan/Observation.hs b/src/Stan/Observation.hs
index 47c24405..93b58154 100644
--- a/src/Stan/Observation.hs
+++ b/src/Stan/Observation.hs
@@ -1,3 +1,5 @@
+{-# LANGUAGE CPP #-}
+
 {- |
 Copyright: (c) 2020 Kowainik
 SPDX-License-Identifier: MPL-2.0
@@ -40,6 +42,9 @@ import Stan.Report.Settings (OutputSettings (..), Verbosity (..), isHidden)
 import Stan.Severity (prettyShowSeverity, severityColour)
 
 import qualified Crypto.Hash.SHA1 as SHA1
+#if MIN_VERSION_base64(1,0,0)
+import qualified Data.Base64.Types
+#endif
 import qualified Data.ByteString.Base64 as Base64
 import qualified Data.ByteString.Char8 as BS
 import qualified Data.HashSet as HS
@@ -269,6 +274,14 @@ mkObservationId insId moduleName srcSpan = Id $ Text.intercalate "-"
     , show (srcSpanStartLine srcSpan) <> ":" <> show (srcSpanStartCol srcSpan)
     ]
 
+#if MIN_VERSION_base64(1,0,0)
+extractBase64 :: Data.Base64.Types.Base64 k a -> a
+extractBase64 = Data.Base64.Types.extractBase64
+#else
+extractBase64 :: a -> a
+extractBase64 = id
+#endif
+
 {- | Hash module name to a short string of length @6@. Hashing
 algorithm is the following:
 
@@ -279,6 +292,7 @@ algorithm is the following:
 hashModuleName :: ModuleName -> Text
 hashModuleName =
     Text.take 6
+    . extractBase64
     . Base64.encodeBase64
     . SHA1.hash
     . encodeUtf8
diff --git a/stan.cabal b/stan.cabal
index f22fba1d..40482878 100644
--- a/stan.cabal
+++ b/stan.cabal
@@ -135,7 +135,7 @@ library
                        Stan.Hie.Debug908
 
   build-depends:       array ^>= 0.5
-                     , base64 ^>= 0.4.1
+                     , base64 >= 0.4.1 && < 2.1
                      , blaze-html ^>= 0.9.1
                      , bytestring >= 0.10 && < 0.13
                      , clay >= 0.14 && < 0.16