;dev: web: drop base-compat dependency
This commit is contained in:
parent
4d5ff3fe4e
commit
c565dbc4f6
@ -9,9 +9,9 @@
|
|||||||
|
|
||||||
module Hledger.Web.Handler.RegisterR where
|
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 Data.List (intersperse, nub, partition)
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
|
import Safe (tailSafe)
|
||||||
import Text.Hamlet (hamletFile)
|
import Text.Hamlet (hamletFile)
|
||||||
|
|
||||||
import Hledger
|
import Hledger
|
||||||
@ -42,11 +42,10 @@ getRegisterR = do
|
|||||||
map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) .
|
map (\(acct,(name,comma)) -> (acct, (T.pack name, T.pack comma))) .
|
||||||
undecorateLinks . elideRightDecorated 40 . decorateLinks .
|
undecorateLinks . elideRightDecorated 40 . decorateLinks .
|
||||||
addCommas . preferReal . otherTransactionAccounts q acctQuery
|
addCommas . preferReal . otherTransactionAccounts q acctQuery
|
||||||
snoc xs x = NonEmpty.prependList xs $ NonEmpty.singleton x
|
|
||||||
addCommas xs =
|
addCommas xs =
|
||||||
zip xs $
|
zip xs $
|
||||||
zip (map (T.unpack . accountSummarisedName . paccount) xs) $
|
zip (map (T.unpack . accountSummarisedName . paccount) xs) $
|
||||||
NonEmpty.tail $ snoc (", "<$xs) ""
|
tailSafe (", "<$xs) ++ [""]
|
||||||
items =
|
items =
|
||||||
styleAmounts (journalCommodityStylesWith HardRounding j) $
|
styleAmounts (journalCommodityStylesWith HardRounding j) $
|
||||||
accountTransactionsReport rspec{_rsQuery=q} j acctQuery
|
accountTransactionsReport rspec{_rsQuery=q} j acctQuery
|
||||||
|
|||||||
@ -161,7 +161,6 @@ library
|
|||||||
Decimal >=0.5.1
|
Decimal >=0.5.1
|
||||||
, aeson >=1 && <2.3
|
, aeson >=1 && <2.3
|
||||||
, base >=4.14 && <4.21
|
, base >=4.14 && <4.21
|
||||||
, base-compat >=0.14.0
|
|
||||||
, base64
|
, base64
|
||||||
, blaze-html
|
, blaze-html
|
||||||
, blaze-markup
|
, blaze-markup
|
||||||
@ -227,7 +226,6 @@ executable hledger-web
|
|||||||
cpp-options: -DVERSION="1.42.99"
|
cpp-options: -DVERSION="1.42.99"
|
||||||
build-depends:
|
build-depends:
|
||||||
base >=4.14 && <4.21
|
base >=4.14 && <4.21
|
||||||
, base-compat >=0.14.0
|
|
||||||
, hledger-web
|
, hledger-web
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
if flag(threaded)
|
if flag(threaded)
|
||||||
@ -250,7 +248,6 @@ test-suite test
|
|||||||
cpp-options: -DVERSION="1.42.99"
|
cpp-options: -DVERSION="1.42.99"
|
||||||
build-depends:
|
build-depends:
|
||||||
base >=4.14 && <4.21
|
base >=4.14 && <4.21
|
||||||
, base-compat >=0.14.0
|
|
||||||
, hledger-web
|
, hledger-web
|
||||||
default-language: Haskell2010
|
default-language: Haskell2010
|
||||||
if flag(threaded)
|
if flag(threaded)
|
||||||
|
|||||||
@ -96,7 +96,6 @@ when:
|
|||||||
|
|
||||||
dependencies:
|
dependencies:
|
||||||
- base >=4.14 && <4.21
|
- base >=4.14 && <4.21
|
||||||
- base-compat >=0.14.0
|
|
||||||
|
|
||||||
library:
|
library:
|
||||||
source-dirs: .
|
source-dirs: .
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user