use ghc 9.2.8

oxarbitrage · Mar 15, 2024 · ba5e6dc · ba5e6dc
1 parent 145bdfa
commit ba5e6dc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 15 deletions.
diff --git a/.github/workflows/cabal.yml b/.github/workflows/cabal.yml
@@ -20,7 +20,7 @@ jobs:
     - uses: haskell-actions/setup@v2
       with:
         ghc-version: '9.2.5'
-        cabal-version: '3.6.2'
+        cabal-version: 'latest'
 
     # install z3
     - name: Setup Z3

diff --git a/.github/workflows/stack.yml b/.github/workflows/stack.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v3
     - uses: haskell-actions/setup@v2
       with:
-        ghc-version: '9.2.5'
+        ghc-version: '9.2.8'
         enable-stack: true
         stack-version: 'latest'
 

diff --git a/cabal.project b/cabal.project
@@ -8,19 +8,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/btq-ag/keelung.git
-    tag: 8856a21477eaf252827746b41c5366979123b6c6
+    tag: 7eefe0f883fd5b595f133ef17b39fd69df737835
 
-source-repository-package
-    type: git
-    location: https://github.com/ucsd-progsys/liquidhaskell
-    tag: fc4a89b91fad8b7a02b72901381d4358a470e230
-    subdir: . liquidhaskell-boot liquid-prelude liquid-vector
-
-source-repository-package
-    type: git
-    location: https://github.com/ucsd-progsys/liquid-fixpoint
-    tag: eb339f9abdf073f8d9f0c446c309006fdf49ed42
-
-with-compiler: ghc-9.2.5
+with-compiler: ghc-9.2.8
 tests: True
 
diff --git a/package.yaml b/package.yaml
@@ -41,6 +41,7 @@ library:
   dependencies:
   - liquidhaskell
   - containers
+  - liquid-prelude
 executables:
   salsa20-exe:
     main:                Main.hs

diff --git a/salsa20.cabal b/salsa20.cabal
@@ -43,6 +43,7 @@ library
       base >=4.7 && <5
     , containers
     , keelung
+    , liquid-prelude
     , liquidhaskell
     , text
   default-language: Haskell2010