From dda9f5d884d44642d72e390b2a21e423dfce3815 Mon Sep 17 00:00:00 2001
From: Rudy Matela <rudy@matela.com.br>
Date: Thu, 6 Jul 2023 12:16:55 +0200
Subject: [PATCH 1/2] remove CI hack

---
 .github/workflows/build.yml | 16 ++++++----------
 mk/haskell.mk               |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c288b68..e962d5d 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -44,16 +44,13 @@ jobs:
 
       - run: git --version
 
-      # Skipping temporarily for ghc 9.6
-      #- run: cabal update
-      #- run: make install-dependencies
+      - run: make install-dependencies
 
-      # GHCFLAGS need to be set for ghc 9.6
-      - run: make GHCFLAGS="-package base -package template-haskell"
-      - run: make GHCFLAGS="-package base -package template-haskell" test
-      - run: make GHCFLAGS="-package base -package template-haskell" haddock
-      - run: make GHCFLAGS="-package base -package template-haskell" test-sdist
-      - run: make GHCFLAGS="-package base -package template-haskell" test-via-cabal
+      - run: make
+      - run: make test
+      - run: make haddock
+      - run: make test-sdist
+      - run: make test-via-cabal
 
 
   test-with-ghc:
@@ -104,7 +101,6 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v3
 
-      - run: cabal update
       - run: make install-dependencies
 
       - run: make
diff --git a/mk/haskell.mk b/mk/haskell.mk
index 68920ee..c7c3c4c 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -90,7 +90,7 @@ depend:
 	find $(ALL_HSS) | ./mk/ghcdeps -i$(GHCIMPORTDIRS) $(GHCFLAGS) > $(DEPMK)
 
 install-dependencies:
-	$(CABAL_INSTALL) $(INSTALL_DEPS)
+	[ -n "$(INSTALL_DEPS)" ] && cabal update && $(CABAL_INSTALL) $(INSTALL_DEPS)
 
 # haddock rules
 haddock: doc/index.html

From d68305148b11d322bc6622455a9dc40e72fdd1fa Mon Sep 17 00:00:00 2001
From: Rudy Matela <rudy@matela.com.br>
Date: Thu, 6 Jul 2023 12:24:05 +0200
Subject: [PATCH 2/2] haskell.mk: improve INSTALL_DEPS conditional

---
 mk/haskell.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mk/haskell.mk b/mk/haskell.mk
index c7c3c4c..27e2966 100644
--- a/mk/haskell.mk
+++ b/mk/haskell.mk
@@ -90,7 +90,10 @@ depend:
 	find $(ALL_HSS) | ./mk/ghcdeps -i$(GHCIMPORTDIRS) $(GHCFLAGS) > $(DEPMK)
 
 install-dependencies:
-	[ -n "$(INSTALL_DEPS)" ] && cabal update && $(CABAL_INSTALL) $(INSTALL_DEPS)
+	if [ -n "$(INSTALL_DEPS)" ]; then \
+		cabal update && \
+		$(CABAL_INSTALL) $(INSTALL_DEPS); \
+	fi
 
 # haddock rules
 haddock: doc/index.html