Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ghc9.4 #1698

Merged
merged 1 commit into from
Dec 26, 2023
Merged

Support ghc9.4 #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
1 change: 0 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion common/api/hstream-api-hs.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion external/digest
Open in desktop
Submodule digest deleted from d03f34
4 changes: 2 additions & 2 deletions hstream-kafka/hstream-kafka.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down