dev: web: fix build with ghc <9.2

simonmichael · Sep 30, 2024 · 7b1ef10 · 7b1ef10
1 parent 36442b3
commit 7b1ef10
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs
@@ -9,7 +9,7 @@
 
 module Hledger.Web.Handler.RegisterR where
 
-import qualified Data.List.NonEmpty as NonEmpty
+import qualified Data.List.NonEmpty.Compat as NonEmpty  -- from base-compat for ghc 8.10
 import Data.List (intersperse, nub, partition)
 import qualified Data.Text as T
 import Text.Hamlet (hamletFile)

diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal
@@ -161,6 +161,7 @@ library
       Decimal >=0.5.1
     , aeson >=1 && <2.3
     , base >=4.14 && <4.21
+    , base-compat
     , base64
     , blaze-html
     , blaze-markup
@@ -226,6 +227,7 @@ executable hledger-web
   cpp-options: -DVERSION="1.40.99"
   build-depends:
       base >=4.14 && <4.21
+    , base-compat
     , hledger-web
   default-language: Haskell2010
   if (flag(dev)) || (flag(library-only))
@@ -250,6 +252,7 @@ test-suite test
   cpp-options: -DVERSION="1.40.99"
   build-depends:
       base >=4.14 && <4.21
+    , base-compat
     , hledger-web
   default-language: Haskell2010
   if (flag(dev)) || (flag(library-only))

diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml
@@ -87,6 +87,7 @@ when:
 
 dependencies:
 - base >=4.14 && <4.21
+- base-compat
 
 library:
   source-dirs: .