From 8f250282005f404521a1f5ad3ad5813ee1783a77 Mon Sep 17 00:00:00 2001
From: mu <59917266+4eUeP@users.noreply.github.com>
Date: Fri, 24 Nov 2023 15:05:05 +0800
Subject: [PATCH] Support ghc9.4

---
 .gitmodules                       | 3 ---
 Makefile                          | 5 ++++-
 cabal.project                     | 1 -
 common/api/hstream-api-hs.cabal   | 2 +-
 external/digest                   | 1 -
 hstream-kafka/hstream-kafka.cabal | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 160000 external/digest

diff --git a/.gitmodules b/.gitmodules
index a26e9fceb..819cf903b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,9 +19,6 @@
 [submodule "external/haskell-rocksdb-bindings"]
 	path = external/haskell-rocksdb-bindings
 	url = https://github.com/hstreamdb/haskell-rocksdb-bindings.git
-[submodule "external/digest"]
-	path = external/digest
-	url = https://github.com/4eUeP/digest.git
 [submodule "external/gsasl-hs"]
 	path = external/gsasl-hs
 	url = https://github.com/Commelina/gsasl-hs.git
diff --git a/Makefile b/Makefile
index adcf9bbba..b9b4193bb 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,10 @@ grpc-hs-deps::
 	# 1. Always install proto-lens-protoc to avoid inconsistency
 	# 2. Change to a temporary dir to avoid create hstream dists.
 	(cd $(shell mktemp -d) && \
-		cabal install -j$(CABAL_BUILD_PARALLEL) --overwrite-policy=always proto-lens-protoc)
+		cabal install -j$(CABAL_BUILD_PARALLEL) \
+			--overwrite-policy=always proto-lens-protoc \
+			--constraint 'proto-lens-protoc ^>= 0.8.0.0' \
+	)
 	($(CABAL) build -j$(CABAL_BUILD_PARALLEL) --project-file $(CABAL_PROJECT_FILE) proto3-suite && \
 		mkdir -p ~/.cabal/bin && \
 		$(CABAL) exec --project-file $(CABAL_PROJECT_FILE) \
diff --git a/cabal.project b/cabal.project
index 1a0dd16c5..26b55ca10 100644
--- a/cabal.project
+++ b/cabal.project
@@ -6,7 +6,6 @@ packages:
   external/gRPC-haskell/grpc-haskell.cabal
   external/gRPC-haskell/core/grpc-haskell-core.cabal
   external/haskell-rocksdb-bindings
-  external/digest/digest.cabal
   external/gsasl-hs/gsasl-hs.cabal
 
   -- * Cpp library
diff --git a/common/api/hstream-api-hs.cabal b/common/api/hstream-api-hs.cabal
index 38dce6087..876c59f8c 100644
--- a/common/api/hstream-api-hs.cabal
+++ b/common/api/hstream-api-hs.cabal
@@ -83,7 +83,7 @@ library
     , deepseq
     , grpc-haskell
     , microlens
-    , proto-lens-protobuf-types  ^>=0.7.1.2
+    , proto-lens-protobuf-types  ^>=0.7.1.3
     , proto-lens-runtime
     , proto3-suite
     , proto3-wire
diff --git a/external/digest b/external/digest
deleted file mode 160000
index d03f3466b..000000000
--- a/external/digest
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d03f3466bcc86169400f5f5578c1fbdfa79dd09a
diff --git a/hstream-kafka/hstream-kafka.cabal b/hstream-kafka/hstream-kafka.cabal
index faee71af5..16c7735e1 100644
--- a/hstream-kafka/hstream-kafka.cabal
+++ b/hstream-kafka/hstream-kafka.cabal
@@ -59,9 +59,9 @@ library kafka-protocol
   hs-source-dirs:     protocol
   build-tool-depends: hpp:hpp >=0.6 && <0.7
   build-depends:
-    , base                 >=4.11 && <5
+    , base                 >=4.11     && <5
     , bytestring
-    , digest
+    , digest               ^>=0.0.2.0
     , hstream-common-base
     , text
     , vector