From 424e07226869c36dd9c1fa238bf3078c06ffd969 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 28 Jul 2025 17:02:37 +0100 Subject: [PATCH] ;pkg: bump default build, tools to lts 24.2 / ghc 9.10.2 --- Shake.hs | 2 +- bin/hledger-register-max.hs | 2 +- bin/hledger-register-max2.hs | 4 ++-- bin/hledger-report1.hs | 2 +- hledger-install/hledger-install.sh | 2 +- stack.yaml | 4 ++-- tools/changelogEdit.hs | 2 +- tools/docshelltest.hs | 2 +- tools/relnotes.hs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Shake.hs b/Shake.hs index 96099a0be..fd32e4033 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2025-04-01 --compile +{- stack script --resolver lts-24.2 --compile --extra-include-dirs /Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include/ffi --package base-prelude --package directory diff --git a/bin/hledger-register-max.hs b/bin/hledger-register-max.hs index ca5c1de12..e00f772d5 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 nightly-2025-04-01 --verbosity error --package hledger-lib --package hledger --package text --package safe +-- -- stack script --compile --resolver lts-24.2 --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 47a96d2ba..ba0642eab 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 nightly-2025-04-01 --verbosity error --package hledger --package text --- stack script --compile --resolver nightly-2025-04-01 --verbosity error --package hledger --package hledger-lib --package text --package safe +-- stack script --compile --resolver lts-24.2 --verbosity error --package hledger --package text +-- stack script --compile --resolver lts-24.2 --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 a65cb5a61..db5ba4996 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 nightly-2025-04-01 --verbosity info --package hledger --package text +-- -- stack script --compile --resolver lts-24.2 --verbosity info --package hledger --package text -- -- (use a released hledger from stackage) -- A custom compound report - like incomestatement but with different, diff --git a/hledger-install/hledger-install.sh b/hledger-install/hledger-install.sh index 439408411..f3c5ff50c 100755 --- a/hledger-install/hledger-install.sh +++ b/hledger-install/hledger-install.sh @@ -58,7 +58,7 @@ PRICEHIST_VERSION=1.4.12 # You can try specifying a different stackage version here, or # commenting out this line to use your current global resolver, # to avoid unnecessary building. -STACKAGE_SNAPSHOT=nightly-2025-05-01 +STACKAGE_SNAPSHOT=lts-24.2 # If any required haskell dependencies aren't in the above stackage snapshot, # list them here in this format: "PKG1-VER1 PKG2-VER2.." diff --git a/stack.yaml b/stack.yaml index 6d61ec48d..1eb47d6f4 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,8 +1,8 @@ -# stack build plan using GHC 9.10.1 +# stack build plan using GHC 9.10.2 # 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: nightly-2025-05-01 +resolver: lts-24.2 packages: - hledger-lib diff --git a/tools/changelogEdit.hs b/tools/changelogEdit.hs index f1e20201b..779c7101d 100755 --- a/tools/changelogEdit.hs +++ b/tools/changelogEdit.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2025-04-01 +{- stack script --resolver lts-24.2 --package data-default --package extra --package process diff --git a/tools/docshelltest.hs b/tools/docshelltest.hs index 8edabc6ca..882cc140f 100755 --- a/tools/docshelltest.hs +++ b/tools/docshelltest.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2025-04-01 --compile +{- stack script --resolver lts-24.2 --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 febca1f86..226927022 100755 --- a/tools/relnotes.hs +++ b/tools/relnotes.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2025-04-01 --compile +{- stack script --resolver lts-24.2 --compile --package process --package split -}