diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs index f2220dcea..85f415935 100644 --- a/hledger-web/Hledger/Web/Handler/RegisterR.hs +++ b/hledger-web/Hledger/Web/Handler/RegisterR.hs @@ -9,9 +9,9 @@ module Hledger.Web.Handler.RegisterR where -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 Safe (tailSafe) import Text.Hamlet (hamletFile) import Hledger @@ -42,11 +42,10 @@ getRegisterR = do map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) . undecorateLinks . elideRightDecorated 40 . decorateLinks . addCommas . preferReal . otherTransactionAccounts q acctQuery - snoc xs x = NonEmpty.prependList xs $ NonEmpty.singleton x addCommas xs = zip xs $ zip (map (T.unpack . accountSummarisedName . paccount) xs) $ - NonEmpty.tail $ snoc (", "<$xs) "" + tailSafe (", "<$xs) ++ [""] items = styleAmounts (journalCommodityStylesWith HardRounding j) $ accountTransactionsReport rspec{_rsQuery=q} j acctQuery diff --git a/hledger-web/hledger-web.cabal b/hledger-web/hledger-web.cabal index e01bfd678..4d32a0f11 100644 --- a/hledger-web/hledger-web.cabal +++ b/hledger-web/hledger-web.cabal @@ -161,7 +161,6 @@ library Decimal >=0.5.1 , aeson >=1 && <2.3 , base >=4.14 && <4.21 - , base-compat >=0.14.0 , base64 , blaze-html , blaze-markup @@ -227,7 +226,6 @@ executable hledger-web cpp-options: -DVERSION="1.42.99" build-depends: base >=4.14 && <4.21 - , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 if flag(threaded) @@ -250,7 +248,6 @@ test-suite test cpp-options: -DVERSION="1.42.99" build-depends: base >=4.14 && <4.21 - , base-compat >=0.14.0 , hledger-web default-language: Haskell2010 if flag(threaded) diff --git a/hledger-web/package.yaml b/hledger-web/package.yaml index fdff72686..57da4a172 100644 --- a/hledger-web/package.yaml +++ b/hledger-web/package.yaml @@ -96,7 +96,6 @@ when: dependencies: - base >=4.14 && <4.21 -- base-compat >=0.14.0 library: source-dirs: .