diff --git a/.github/workflows/binaries-mac-x64.yml b/.github/workflows/binaries-mac-x64.yml index 71abbaf5f..d75f1cb02 100644 --- a/.github/workflows/binaries-mac-x64.yml +++ b/.github/workflows/binaries-mac-x64.yml @@ -28,7 +28,8 @@ jobs: # - { ghc: "90" , stack: "stack --stack-yaml=stack9.0.yaml" } # - { ghc: "92" , stack: "stack --stack-yaml=stack9.2.yaml" } # - { ghc: "94" , stack: "stack --stack-yaml=stack9.4.yaml" } - - { ghc: "96" , stack: "stack --stack-yaml=stack.yaml" } + # - { ghc: "96" , stack: "stack --stack-yaml=stack9.6.yaml" } + - { ghc: "98" , stack: "stack --stack-yaml=stack.yaml" } steps: diff --git a/Shake.hs b/Shake.hs index 5e32a97f4..581762eba 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack script --resolver nightly-2024-03-14 --compile +{- stack script --resolver nightly-2024-04-08 --compile --extra-include-dirs /Library/Developer/CommandLineTools/SDKs/MacOSX12.1.sdk/usr/include/ffi --package base-prelude --package directory diff --git a/stack.yaml b/stack.yaml index 7a41c102f..27ce937e6 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,6 +1,6 @@ -# stack build plan using GHC 9.8.1 +# stack build plan using GHC 9.8.2 -resolver: nightly-2024-03-14 +resolver: nightly-2024-04-08 packages: - hledger-lib @@ -8,13 +8,8 @@ packages: - hledger-ui - hledger-web -# XXX extra-deps: - base64-0.4.2.4 # hledger-web does not yet support base64-1 -- cassava-megaparsec-2.1.1 # to support current bytestring/vector; not yet in stackage -- email-validate-2.3.2.20 # to support 9.8's template-haskell; not yet in stackage -- yesod-1.6.2.1 # not yet in stackage -- yesod-form-1.7.6 # not yet in stackage nix: pure: false