imp: stack: build with ghc 9.8, latest stackage nightly

This commit is contained in:
Simon Michael 2024-01-04 06:40:17 -10:00
parent 1648d2bcb7
commit 2a99b3d456
7 changed files with 33 additions and 15 deletions

View File

@ -39,7 +39,7 @@ extra-source-files:
#data-files: #data-files:
dependencies: dependencies:
- base >=4.14 && <4.19 - base >=4.14 && <4.20
- base-compat - base-compat
- aeson >=1 && <2.3 - aeson >=1 && <2.3
- aeson-pretty - aeson-pretty

View File

@ -49,7 +49,7 @@ ghc-options:
- -Wno-unused-do-bind - -Wno-unused-do-bind
dependencies: dependencies:
- base >=4.14 && <4.19 - base >=4.14 && <4.20
# curses is required to build terminfo for vty for hledger-ui. # curses is required to build terminfo for vty for hledger-ui.
# On POSIX systems it might be not present. # On POSIX systems it might be not present.
@ -98,7 +98,7 @@ library:
- time >=1.5 - time >=1.5
- transformers - transformers
- vector - vector
- brick >=2.1.1 && <2.3 - brick >=2.1.1 && <2.4
- vty >=6.1 && <6.2 - vty >=6.1 && <6.2
- vty-crossplatform >= 0.4.0.0 && < 0.5.0.0 - vty-crossplatform >= 0.4.0.0 && < 0.5.0.0
when: when:
@ -114,7 +114,7 @@ executables:
source-dirs: app source-dirs: app
main: hledger-ui.hs main: hledger-ui.hs
dependencies: dependencies:
- base >=4.14 && <4.19 - base >=4.14 && <4.20
- hledger-ui - hledger-ui
when: when:
- condition: flag(threaded) - condition: flag(threaded)

View File

@ -11,6 +11,7 @@ module Hledger.Web.Handler.RegisterR where
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 (tailDef)
import Text.Hamlet (hamletFile) import Text.Hamlet (hamletFile)
import Hledger import Hledger
@ -44,7 +45,7 @@ getRegisterR = do
addCommas xs = addCommas xs =
zip xs $ zip xs $
zip (map (T.unpack . accountSummarisedName . paccount) xs) $ zip (map (T.unpack . accountSummarisedName . paccount) xs) $
tail $ (", "<$xs) ++ [""] tailDef [""] $ (", "<$xs)
items = items =
styleAmounts (journalCommodityStylesWith HardRounding j) $ styleAmounts (journalCommodityStylesWith HardRounding j) $
accountTransactionsReport rspec{_rsQuery=q} j acctQuery accountTransactionsReport rspec{_rsQuery=q} j acctQuery

View File

@ -78,7 +78,7 @@ when:
ghc-options: -O0 ghc-options: -O0
dependencies: dependencies:
- base >=4.14 && <4.19 - base >=4.14 && <4.20
library: library:
source-dirs: . source-dirs: .

View File

@ -15,7 +15,7 @@ import Control.Concurrent as M
import Control.Monad as M import Control.Monad as M
import Data.Char as M import Data.Char as M
import Data.Either as M import Data.Either as M
import Data.Functor as M import Data.Functor as M hiding (unzip)
import Data.List as M import Data.List as M
import Data.Maybe as M import Data.Maybe as M
import Data.Ord as M import Data.Ord as M

View File

@ -99,7 +99,7 @@ ghc-options:
- -optP-Wno-nonportable-include-path - -optP-Wno-nonportable-include-path
dependencies: dependencies:
- base >=4.14 && <4.19 - base >=4.14 && <4.20
- hledger-lib >=1.32.99 && <1.33 - hledger-lib >=1.32.99 && <1.33
- aeson >=1 && <2.3 - aeson >=1 && <2.3
- ansi-terminal >=0.9 - ansi-terminal >=0.9

View File

@ -1,20 +1,37 @@
# stack build plan using GHC 9.8.1 (WIP) # stack build plan using GHC 9.8.1
resolver: ghc-9.8.1 resolver: nightly-2024-01-04
packages: packages:
- hledger-lib - hledger-lib
# - hledger - hledger
# - hledger-ui # blocked by https://github.com/luite/hfsevents/issues/16
# - hledger-web #- hledger-ui
- hledger-web
extra-deps:
- cassava-megaparsec-2.1.0
- email-validate-2.3.2.19
- yesod-1.6.2.1
- yesod-form-1.7.6
# work around https://github.com/stackbuilders/cassava-megaparsec/issues/39
allow-newer: true
# not working for me
# allow-newer-deps:
# - cassava-megaparsec
# - vector
# extra-deps:
nix: nix:
pure: false pure: false
packages: [perl gmp ncurses zlib] packages: [perl gmp ncurses zlib]
# ghc-options: ghc-options:
# silence 9.8's new partial warnings for now
"$locals": -Wno-x-partial
# "$locals": -fplugin Debug.Breakpoint # "$locals": -fplugin Debug.Breakpoint
# # for precise profiling, per https://www.tweag.io/posts/2020-01-30-haskell-profiling.html: # # for precise profiling, per https://www.tweag.io/posts/2020-01-30-haskell-profiling.html: