Merge branch 'develop' into ghc(js)-9.10

reflex-frp · Sep 27, 2024 · 0bf60ac · 0bf60ac
2 parents d9181cd + b81a38a
commit 0bf60ac
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -12,11 +12,14 @@ jobs:
 
     name: GHC ${{ matrix.ghc }} on ${{ matrix.os }}
     steps:
+
     - uses: actions/checkout@v3
+
     - uses: haskell/actions/setup@v2
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: '3.10.1.0'
+        cabal-version: '3.10.3.0'
+
     - name: Cache
       uses: actions/cache@v3
       env:
@@ -31,11 +34,16 @@ jobs:
           ${{ runner.os }}
 
     - name: Install dependencies
-      run: cabal build --only-dependencies --enable-tests --enable-benchmarks
+      run: |
+        cabal update
+        cabal build --only-dependencies --enable-tests --enable-benchmarks
+
     - name: Build
       run: cabal build --enable-tests --enable-benchmarks all
+
     - name: Run tests
       run: cabal test --enable-tests all
+
     - if: matrix.ghc != '8.4.4'
       # docs aren't built on ghc 8.4.4 because some dependency docs don't build on older GHCs
       name: Build Docs

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # Revision history for reflex
 
+## Unreleased
+
+* Add support for GHC 9.8 and 9.10
+
 ## 0.9.3.0
 
 * Headless Host: Generalize to allow returning arbitrary types

diff --git a/release.nix b/release.nix
@@ -66,8 +66,8 @@ let
 
             patch = self.callHackageDirect {
               pkg = "patch";
-              ver = "0.0.8.2";
-              sha256 = "160zqqhjg48fr3a33gffd82qm3728c8hwf8sn37pbpv82fw71rzg";
+              ver = "0.0.8.3";
+              sha256 = "054slcrlsdcs6azwph6v3vgsgk939ax7ax9xw76whywkrim20n1w";
             } {};
           };
         };