unisonweb · sellout · Jul 4, 2025 · Jul 7, 2025 · Jul 6, 2025 · Jul 7, 2025
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: 
+        os:
           - ubuntu-24.04
           - ubuntu-24.04-arm
           - macos-13 # intel
@@ -46,7 +46,7 @@ jobs:
       - name: install stack
         uses: unisonweb/actions/stack/install@main
         with:
-          stack-version: 2.15.5
+          stack-version: 3.5.1
 
       - name: build
         run: |
@@ -212,7 +212,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: 
+        os:
           - ubuntu-24.04
           - ubuntu-24.04-arm
           - macos-13

@@ -86,7 +86,7 @@ jobs:
         if: steps.cache-ucm-binaries.outputs.cache-hit != 'true'
         uses: unisonweb/actions/stack/install@main
         with:
-          stack-version: 2.15.5
+          stack-version: 3.5.1
 
       # Build deps, then build local code. Splitting it into two steps just allows us to see how much time each step
       # takes.

@@ -11,7 +11,7 @@ on:
 
 env:
   ## Some version numbers that are used during CI
-  ormolu_version: 0.7.2.0
+  ormolu_version: 0.7.4.0
 
 jobs:
   ormolu:

@@ -28,7 +28,7 @@ jobs:
       - name: install stack
         uses: unisonweb/actions/stack/install@main
         with:
-          stack-version: 2.15.5
+          stack-version: 3.5.1
 
       - name: build with haddocks
         working-directory: unison

@@ -34,13 +34,6 @@ jobs:
         sudo mkdir /nix /mnt/nix
         sudo mount --bind /mnt/nix /nix
     - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
-      if: runner.os == 'Linux'
-      with:
-        extra_nix_config: |
-          extra-trusted-public-keys = hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ=
-          extra-substituters = https://cache.iog.io
-    - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
-      if: runner.os != 'Linux'
     - uses: cachix/cachix-action@ad2ddac53f961de1989924296a1f236fcfbaa4fc # v15
       with:
         name: unison

@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 
 env:
-  ormolu_version: "0.7.2.0"
+  ormolu_version: "0.7.4.0"
 
 jobs:
   ormolu:

@@ -23,7 +23,7 @@ jobs:
       - name: install stack
         uses: unisonweb/actions/stack/install@main
         with:
-          stack-version: 2.15.5
+          stack-version: 3.5.1
 
       # One of the transcripts fails if the user's git name hasn't been set.
       - name: set git user info

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,7 @@
 {
   "haskell.toolchain": {
-    "cabal": "3.10.3.0",
-    "hls": "2.8.0.0",
-    "stack": "2.15.7"
+    "cabal": "3.14.2.0",
+    "hls": "2.10.0.0",
+    "stack": "3.5.1"
   }
 }
diff --git a/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal b/codebase2/codebase-sqlite-hashing-v2/unison-codebase-sqlite-hashing-v2.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal b/codebase2/codebase-sqlite/unison-codebase-sqlite.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/codebase-sync/unison-codebase-sync.cabal b/codebase2/codebase-sync/unison-codebase-sync.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/codebase/unison-codebase.cabal b/codebase2/codebase/unison-codebase.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/core/U/Core/ABT.hs b/codebase2/core/U/Core/ABT.hs
@@ -289,7 +289,6 @@ rename old new t0@(Term fvs ann t) =
           else -- the rename would capture new, freshen this Abs
           -- to make that no longer true, then proceed with
           -- renaming `old` to `new`
-
             if v == new
               then
                 let v' = freshIn (Set.fromList [new, old] <> freeVars body) v

diff --git a/codebase2/core/unison-core.cabal b/codebase2/core/unison-core.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.36.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/util-serialization/unison-util-serialization.cabal b/codebase2/util-serialization/unison-util-serialization.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
 

diff --git a/codebase2/util-term/unison-util-term.cabal b/codebase2/util-term/unison-util-term.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.38.0.
 --
 -- see: https://github.com/sol/hpack
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ on: @@
     env:
       ## Some version numbers that are used during CI
-      ormolu_version: 0.7.2.0
+      ormolu_version: 0.7.4.0
     jobs:
       ormolu:
@@ Expand Down @@