diff --git a/Shake.hs b/Shake.hs index 20ab5b35cc4..78a037ca36f 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-09-26 --compile +{- stack script --resolver nightly-2024-11-30 --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 c6e05565d3b..c59f6243fec 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-09-26 --verbosity error --package hledger-lib --package hledger --package text --package safe +-- -- stack script --compile --resolver nightly-2024-11-30 --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 e876d1e5cee..5b3ea1d829f 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-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 +-- 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 -- 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 b76f6b8c2fc..1dbe071783b 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-09-26 --verbosity info --package hledger --package text +-- -- stack script --compile --resolver nightly-2024-11-30 --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 667f946478b..eb12ce15931 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-09-26 --verbosity error --package hledger --package hledger-lib --package text --compile +-- stack script --snapshot nightly-2024-11-30 --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/stack.yaml b/stack.yaml index 04e282ff976..573df37e9ae 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: nightly-2024-09-26 +resolver: nightly-2024-11-30 compiler: ghc-9.10.1 notify-if-ghc-untested: false notify-if-cabal-untested: false @@ -18,24 +18,20 @@ extra-deps: # for hledger-lib - Cabal-3.12.0.0 - Cabal-syntax-3.12.0.0 -- directory-1.3.8.3@rev:3 -- filepath-1.4.300.2 -#- filepath-1.5.3.0 # not accepted for hledger-lib for some reason +- directory-1.3.9.0 +- filepath-1.4.301.0 - ghc-boot-9.10.1@rev:1 -- process-1.6.24.0 -- unix-2.8.5.1 +- process-1.6.25.0 +- unix-2.8.6.0 # for windows - Win32-2.14.0.0 -- time-1.12.2 - # for hledger - haskeline-0.8.2.1 # to silence a warning - wizards-1.0.3@rev:3 - # for dev builds when the debug flag is enabled: -- ghc-debug-convention-0.6.0.0 -- ghc-debug-stub-0.6.0.0 +# - ghc-debug-convention-0.6.0.0 +# - ghc-debug-stub-0.6.0.0 nix: pure: false diff --git a/tools/changelog.hs b/tools/changelog.hs index 1cbf6e19112..a48e1440e71 100755 --- a/tools/changelog.hs +++ b/tools/changelog.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-09-26 +{- stack script --resolver nightly-2024-11-30 --package data-default --package extra --package process diff --git a/tools/docshelltest.hs b/tools/docshelltest.hs index 1caf4a15a07..b3c5b70dfea 100755 --- a/tools/docshelltest.hs +++ b/tools/docshelltest.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-09-26 --compile +{- stack script --resolver nightly-2024-11-30 --compile -} -- add this to see packages being installed instead of a long silence: -- --verbosity=info