diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4c44f1a2f..f3887bc7c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -101,7 +101,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-linux-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: install stack (macOS) @@ -109,7 +109,7 @@ jobs: if: runner.os == 'macOS' run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-osx-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-osx-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: install stack (windows) @@ -117,7 +117,7 @@ jobs: if: runner.os == 'Windows' run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-windows-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-windows-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH # One of the transcripts fails if the user's git name hasn't been set. diff --git a/.github/workflows/haddocks.yaml b/.github/workflows/haddocks.yaml index 3f6bdbbf7..923283c82 100644 --- a/.github/workflows/haddocks.yaml +++ b/.github/workflows/haddocks.yaml @@ -62,7 +62,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-linux-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH # One of the transcripts fails if the user's git name hasn't been set. diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml index 1e2ece8c1..18473efd9 100644 --- a/.github/workflows/pre-release.yaml +++ b/.github/workflows/pre-release.yaml @@ -23,7 +23,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-linux-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH # One of the transcripts fails if the user's git name hasn't been set. @@ -61,7 +61,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-osx-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-osx-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH # One of the transcripts fails if the user's git name hasn't been set. @@ -104,7 +104,7 @@ jobs: if: runner.os == 'Windows' run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-windows-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.9.1/stack-2.9.1-windows-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: build @@ -118,7 +118,7 @@ jobs: run: | mkdir -p tmp\ui mkdir -p release\ui - $UCM = .\stack\stack-2.7.5-windows-x86_64\stack.exe exec -- where unison + $UCM = .\stack\stack-2.9.1-windows-x86_64\stack.exe exec -- where unison cp $UCM .\release\ucm.exe Invoke-WebRequest -Uri https://github.com/unisonweb/unison-local-ui/releases/download/latest/unisonLocal.zip -OutFile tmp\unisonLocal.zip Expand-Archive -Path tmp\unisonLocal.zip -DestinationPath release\ui diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index c4f5ce6d5..027056b0d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -104,7 +104,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-linux-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.9.1-linux-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: build @@ -176,7 +176,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-osx-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.9.1-osx-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: remove ~/.stack/setup-exe-cache on macOS @@ -252,7 +252,7 @@ jobs: working-directory: ${{ github.workspace }} run: | mkdir stack && cd stack - curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.7.5-windows-x86_64.tar.gz | tar -xz + curl -L https://github.com/commercialhaskell/stack/releases/download/v2.7.5/stack-2.9.1-windows-x86_64.tar.gz | tar -xz echo "$PWD/stack-"* >> $GITHUB_PATH - name: build @@ -277,7 +277,7 @@ jobs: run: | mkdir -p tmp\ui mkdir -p release\ui - $UCM = .\stack\stack-2.7.5-windows-x86_64\stack.exe exec -- where unison + $UCM = .\stack\stack-2.9.1-windows-x86_64\stack.exe exec -- where unison cp $UCM .\release\ucm.exe Invoke-WebRequest -Uri https://github.com/unisonweb/unison-local-ui/releases/download/latest/unisonLocal.zip -OutFile tmp\unisonLocal.zip Expand-Archive -Path tmp\unisonLocal.zip -DestinationPath release\ui diff --git a/docs/m1-mac-setup-tips.markdown b/docs/m1-mac-setup-tips.markdown index f7629c6cf..6a24f3ad4 100644 --- a/docs/m1-mac-setup-tips.markdown +++ b/docs/m1-mac-setup-tips.markdown @@ -6,7 +6,7 @@ If you are a newcomer to the Haskell ecosystem trying to set up your dev environ Here is a working set of versions you can use to build the Unison executable: GHC version: 8.10.7 -Stack version: 2.7.5 +Stack version: 2.9.1 Cabal version 3.6.2.0 Haskell language server version: 1.7.0.0 @@ -45,7 +45,7 @@ The GHCup Haskell installer, version 0.1.19.0 $ which stack ~/.ghcup/bin/stack $ stack --version -Version 2.7.5, Git revision 717ec96c15520748f3fcee00f72504ddccaa30b5 (dirty) (163 commits) aarch64 +Version 2.9.1, Git revision 13c9c8772a6dce093dbeacc08bb5877bdb6cfc2e (dirty) (155 commits) aarch64 ``` ```shell @@ -79,7 +79,7 @@ Cradle type: Stack Tool versions found on the $PATH cabal: 3.6.2.0 -stack: 2.7.5 +stack: 2.9.1 ghc: 8.10.7 ``` @@ -88,7 +88,7 @@ If you're a VS Code user, you can download the Haskell extension for IDE support ```json "haskell.manageHLS": "GHCup", "haskell.toolchain": { - "stack": "2.7.5", + "stack": "2.9.1", "ghc": "8.10.7", "cabal": "recommended", "hls": "1.7.0.0" diff --git a/lib/unison-pretty-printer/unison-pretty-printer.cabal b/lib/unison-pretty-printer/unison-pretty-printer.cabal index f23faeed9..813774eff 100644 --- a/lib/unison-pretty-printer/unison-pretty-printer.cabal +++ b/lib/unison-pretty-printer/unison-pretty-printer.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack @@ -68,9 +68,9 @@ library , unison-prelude , unison-syntax , unliftio + default-language: Haskell2010 if flag(optimized) ghc-options: -funbox-strict-fields -O2 - default-language: Haskell2010 executable prettyprintdemo main-is: Main.hs @@ -103,9 +103,9 @@ executable prettyprintdemo , safe , text , unison-pretty-printer + default-language: Haskell2010 if flag(optimized) ghc-options: -funbox-strict-fields -O2 - default-language: Haskell2010 test-suite pretty-printer-tests type: exitcode-stdio-1.0 @@ -146,6 +146,6 @@ test-suite pretty-printer-tests , raw-strings-qq , unison-pretty-printer , unison-syntax + default-language: Haskell2010 if flag(optimized) ghc-options: -funbox-strict-fields -O2 - default-language: Haskell2010 diff --git a/parser-typechecker/unison-parser-typechecker.cabal b/parser-typechecker/unison-parser-typechecker.cabal index 67a44d262..199865ef7 100644 --- a/parser-typechecker/unison-parser-typechecker.cabal +++ b/parser-typechecker/unison-parser-typechecker.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack @@ -308,11 +308,11 @@ library , x509-system , yaml , zlib + default-language: Haskell2010 if flag(optimized) ghc-options: -funbox-strict-fields -O2 if flag(arraychecks) cpp-options: -DARRAY_CHECK - default-language: Haskell2010 test-suite parser-typechecker-tests type: exitcode-stdio-1.0 @@ -500,8 +500,8 @@ test-suite parser-typechecker-tests , x509-system , yaml , zlib + default-language: Haskell2010 if flag(optimized) ghc-options: -funbox-strict-fields -O2 if flag(arraychecks) cpp-options: -DARRAY_CHECK - default-language: Haskell2010 diff --git a/unison-cli/unison-cli.cabal b/unison-cli/unison-cli.cabal index 7c59e5b8a..9573c1eca 100644 --- a/unison-cli/unison-cli.cabal +++ b/unison-cli/unison-cli.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack @@ -203,12 +203,12 @@ library , wai , warp , witherable + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields if !os(windows) build-depends: unix - default-language: Haskell2010 executable cli-integration-tests main-is: Suite.hs @@ -331,9 +331,9 @@ executable cli-integration-tests , wai , warp , witherable + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields - default-language: Haskell2010 executable transcripts main-is: Transcripts.hs @@ -453,9 +453,9 @@ executable transcripts , wai , warp , witherable + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields - default-language: Haskell2010 executable unison main-is: Main.hs @@ -582,9 +582,9 @@ executable unison , wai , warp , witherable + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields - default-language: Haskell2010 test-suite cli-tests type: exitcode-stdio-1.0 @@ -714,6 +714,6 @@ test-suite cli-tests , wai , warp , witherable + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields - default-language: Haskell2010 diff --git a/unison-core/unison-core1.cabal b/unison-core/unison-core1.cabal index 1261b0ded..48eac1036 100644 --- a/unison-core/unison-core1.cabal +++ b/unison-core/unison-core1.cabal @@ -1,6 +1,6 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.34.4. +-- This file has been generated from package.yaml by hpack version 0.35.0. -- -- see: https://github.com/sol/hpack @@ -106,6 +106,6 @@ library , unison-util-base32hex , unison-util-relation , vector + default-language: Haskell2010 if flag(optimized) ghc-options: -O2 -funbox-strict-fields - default-language: Haskell2010