diff --git a/Shake.hs b/Shake.hs index 2f4d498f2..e8f6f3c8b 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver lts-24.8 --compile +{- stack script --resolver lts-24.10 --compile --extra-include-dirs /Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include/ffi --package base-prelude --package directory diff --git a/bin/gsheet-csv.hs b/bin/gsheet-csv.hs index 822b6bc1e..48cae13ce 100755 --- a/bin/gsheet-csv.hs +++ b/bin/gsheet-csv.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack --resolver=lts-18.28 script --compile --verbosity=error +{- stack --resolver=lts-24.10 script --compile --verbosity=error --package "bytestring cassava gogol gogol-core gogol-sheets lens pretty-show text" -} -- or diff --git a/bin/hledger-register-max.hs b/bin/hledger-register-max.hs index 1c53019d4..c71fe71c3 100755 --- a/bin/hledger-register-max.hs +++ b/bin/hledger-register-max.hs @@ -1,7 +1,7 @@ #!/usr/bin/env stack -- stack runghc -- (requires hledger > 1.34) --- -- stack script --compile --resolver lts-24.8 --verbosity error --package hledger-lib --package hledger --package text --package safe +-- -- stack script --compile --resolver lts-24.10 --verbosity error --package hledger-lib --package hledger --package text --package safe -- hledger-register-max - runs "hledger register" and prints the posting with largest running total/balance. -- Usage: diff --git a/bin/hledger-register-max2.hs b/bin/hledger-register-max2.hs index dee120426..715cb3044 100755 --- a/bin/hledger-register-max2.hs +++ b/bin/hledger-register-max2.hs @@ -1,8 +1,8 @@ #!/usr/bin/env stack -- stack runghc --verbosity error --package hledger -- stack runghc --verbosity error --package hledger --package hledger-lib --package text --package safe --- stack script --compile --resolver lts-24.8 --verbosity error --package hledger --package text --- stack script --compile --resolver lts-24.8 --verbosity error --package hledger --package hledger-lib --package text --package safe +-- stack script --compile --resolver lts-24.10 --verbosity error --package hledger --package text +-- stack script --compile --resolver lts-24.10 --verbosity error --package hledger --package hledger-lib --package text --package safe -- The topmost stack command above is used to run this script. -- stack script uses released hledger, stack runghc uses local hledger source. -- This script currently requires local hledger source, for Hledger.Cli.Script. diff --git a/bin/hledger-report1.hs b/bin/hledger-report1.hs index 4ca6dbc18..7c74ce1a6 100755 --- a/bin/hledger-report1.hs +++ b/bin/hledger-report1.hs @@ -1,7 +1,7 @@ #!/usr/bin/env stack -- stack runghc --verbosity error --package hledger --package hledger-lib --package text --package safe -- (use the local hledger source) --- -- stack script --compile --resolver lts-24.8 --verbosity info --package hledger --package text +-- -- stack script --compile --resolver lts-24.10 --verbosity info --package hledger --package text -- -- (use a released hledger from stackage) -- A custom compound report - like incomestatement but with different, diff --git a/stack.yaml b/stack.yaml index ca7dee895..8289bc2fa 100644 --- a/stack.yaml +++ b/stack.yaml @@ -2,7 +2,7 @@ # https://gitlab.haskell.org/ghc/ghc/-/wikis/migration/9.10 # https://downloads.haskell.org/ghc/9.10.1/docs/users_guide/9.10.1-notes.html -resolver: lts-24.8 +resolver: lts-24.10 packages: - hledger-lib diff --git a/stack912.yaml b/stack912.yaml index ed558c12f..d0d8512f0 100644 --- a/stack912.yaml +++ b/stack912.yaml @@ -9,14 +9,11 @@ packages: - hledger-ui - hledger-web -resolver: nightly-2025-07-28 +resolver: nightly-2025-09-15 notify-if-ghc-untested: false notify-if-cabal-untested: false extra-deps: -# snapshot contains vty-windows 0.2.0.4 (which requires Win32 >=2.14.2) -# and Win32-2.14.1.0 (a ghc 9.12.2 boot lib), which do not build together. -- vty-windows-0.2.0.3 # currently not in stackage - yesod-static-1.6.1.0 - yesod-test-1.6.19 diff --git a/stack96.yaml b/stack96.yaml index 81843f02b..bc507c089 100644 --- a/stack96.yaml +++ b/stack96.yaml @@ -1,6 +1,6 @@ -# stack build plan using GHC 9.6.6 +# stack build plan using GHC 9.6.7 -resolver: lts-22.43 +resolver: lts-22.44 packages: - hledger-lib @@ -10,8 +10,6 @@ packages: extra-deps: - encoding-0.10 -- fsnotify-0.4.2.0 -- hfsevents-0.1.8 - vty-windows-0.2.0.1 nix: diff --git a/stack98.yaml b/stack98.yaml index 839e1fbdc..b6832fd1e 100644 --- a/stack98.yaml +++ b/stack98.yaml @@ -1,6 +1,6 @@ # stack build plan using GHC 9.8.4 -resolver: lts-23.11 +resolver: lts-23.28 packages: - hledger-lib @@ -8,9 +8,7 @@ packages: - hledger-ui - hledger-web -extra-deps: -- encoding-0.10 -- fsnotify-0.4.2.0 +#extra-deps: nix: pure: false diff --git a/tools/changelogEdit.hs b/tools/changelogEdit.hs index 59f4faac2..03fc47054 100755 --- a/tools/changelogEdit.hs +++ b/tools/changelogEdit.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver lts-24.8 +{- stack script --resolver lts-24.10 --package data-default --package extra --package process diff --git a/tools/docshelltest.hs b/tools/docshelltest.hs index 89cf33e6a..fa8ece95b 100755 --- a/tools/docshelltest.hs +++ b/tools/docshelltest.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver lts-24.8 --compile +{- stack script --resolver lts-24.10 --compile -} -- add this to see packages being installed instead of a long silence: -- --verbosity=info diff --git a/tools/relnotes.hs b/tools/relnotes.hs index 3932b183e..35c709050 100755 --- a/tools/relnotes.hs +++ b/tools/relnotes.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver lts-24.8 --compile +{- stack script --resolver lts-24.10 --compile --package process --package split -}