From 81d20ecaf8a0197ae7afdf9038f6f7799a42962b Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 3 Dec 2024 09:12:14 -1000 Subject: [PATCH] ;tools: revert to ghc 9.8.2 for now running these with ghc 9.10 is awkward --- Shake.hs | 2 +- bin/hledger-register-max.hs | 2 +- bin/hledger-register-max2.hs | 4 ++-- bin/hledger-report1.hs | 2 +- bin/hledger-script-example.hs | 2 +- tools/changelog.hs | 2 +- tools/docshelltest.hs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Shake.hs b/Shake.hs index 78a037ca3..20ab5b35c 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-11-30 --compile +{- stack script --resolver nightly-2024-09-26 --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 c59f6243f..c6e05565d 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-2024-11-30 --verbosity error --package hledger-lib --package hledger --package text --package safe +-- -- stack script --compile --resolver nightly-2024-09-26 --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 5b3ea1d82..e876d1e5c 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-2024-11-30 --verbosity error --package hledger --package text --- stack script --compile --resolver nightly-2024-11-30 --verbosity error --package hledger --package hledger-lib --package text --package safe +-- stack script --compile --resolver nightly-2024-09-26 --verbosity error --package hledger --package text +-- stack script --compile --resolver nightly-2024-09-26 --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 1dbe07178..b76f6b8c2 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-2024-11-30 --verbosity info --package hledger --package text +-- -- stack script --compile --resolver nightly-2024-09-26 --verbosity info --package hledger --package text -- -- (use a released hledger from stackage) -- A custom compound report - like incomestatement but with different, diff --git a/bin/hledger-script-example.hs b/bin/hledger-script-example.hs index eb12ce159..667f94647 100755 --- a/bin/hledger-script-example.hs +++ b/bin/hledger-script-example.hs @@ -16,7 +16,7 @@ -- stack script --snapshot lts-22.27 --verbosity error --package hledger --package text -- (Uses the specified snapshot with its hledger and ghc, https://www.stackage.org/lts-22.27) -- --- stack script --snapshot nightly-2024-11-30 --verbosity error --package hledger --package hledger-lib --package text --compile +-- stack script --snapshot nightly-2024-09-26 --verbosity error --package hledger --package hledger-lib --package text --compile -- (Uses a newer snapshot, hledger and ghc. The --compile flag compiles the script to a faster binary.) -- ------------------------------------78---------------------------------------- diff --git a/tools/changelog.hs b/tools/changelog.hs index a48e1440e..1cbf6e191 100755 --- a/tools/changelog.hs +++ b/tools/changelog.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-11-30 +{- stack script --resolver nightly-2024-09-26 --package data-default --package extra --package process diff --git a/tools/docshelltest.hs b/tools/docshelltest.hs index b3c5b70df..1caf4a15a 100755 --- a/tools/docshelltest.hs +++ b/tools/docshelltest.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-11-30 --compile +{- stack script --resolver nightly-2024-09-26 --compile -} -- add this to see packages being installed instead of a long silence: -- --verbosity=info