Switches to GHC 9.2.2 and bumps Stackage up (#22)

* Bumps LTS and Nightly * Reduces upper bound * Updates cabal * Drops Hashable for Ideal * Hashable
konn · Mar 20, 2022 · 179c361 · 179c361
1 parent 6e87b1e
commit 179c361
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 105 deletions.
diff --git a/.github/dhall/haskell.dhall b/.github/dhall/haskell.dhall
@@ -14,7 +14,7 @@ let versions =
       [ (ghc "8.10.7")
         with generate-page = True
       , ghc "9.0.2"
-      , lib.ghcHead "9.2.1"
+      , lib.ghcHead "9.2.2"
       ]
 
 let ghcHeaders = lib.makeGhcHeader versions

diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -55,7 +55,7 @@ jobs:
         - '8.10.7'
         - '9.0.2'
         include:
-        - ghc: '9.2.1'
+        - ghc: '9.2.2'
           isHead: true
         isHead:
         - false
@@ -183,7 +183,7 @@ jobs:
         - '8.10.7'
         - '9.0.2'
         include:
-        - ghc: '9.2.1'
+        - ghc: '9.2.2'
           isHead: true
         isHead:
         - false

diff --git a/algebraic-prelude/algebraic-prelude.cabal b/algebraic-prelude/algebraic-prelude.cabal
@@ -36,7 +36,7 @@ library
   build-depends:
       base >=4.7 && <5
     , basic-prelude
-    , lens >=4.0 && <5.1
+    , lens >=4.0 && <5.2
     , semigroups
   if impl(ghc >=8.4)
     build-depends:

diff --git a/algebraic-prelude/package.yaml b/algebraic-prelude/package.yaml
@@ -21,7 +21,7 @@ library:
   dependencies:
   - base >=4.7 && <5
   - basic-prelude
-  - lens >= 4.0 && < 5.1
+  - lens >= 4.0 && < 5.2
   - semigroups
   when:
   - condition: impl(ghc >=8.4)

diff --git a/halg-core/src/Algebra/Ring/Ideal.hs b/halg-core/src/Algebra/Ring/Ideal.hs
@@ -35,8 +35,7 @@ import qualified Data.Vector as V
 
 newtype Ideal r = Ideal (Seq r)
   deriving
-    ( Hashable
-    , NFData
+    ( NFData
     , Foldable
     , Traversable
     , Functor

diff --git a/halg-polynomials/src/Algebra/Ring/Polynomial/Univariate.hs b/halg-polynomials/src/Algebra/Ring/Polynomial/Univariate.hs
@@ -53,7 +53,7 @@ newtype Unipol r = Unipol {runUnipol :: IM.IntMap r}
 
 type role Unipol representational
 
-instance Hashable r => Hashable (Unipol r) where
+instance (DecidableZero r, Hashable r) => Hashable (Unipol r) where
   hashWithSalt p = hashWithSalt p . IM.toList . runUnipol
 
 {- | By this instance, you can use @#x@ for

diff --git a/stack-9.0.2.yaml b/stack-9.0.2.yaml
@@ -1,5 +1,4 @@
-resolver: nightly-2022-01-27
-compiler-check: match-exact
+resolver: lts-19.0
 
 build:
   haddock-deps: false
@@ -22,6 +21,5 @@ packages:
 - 'halg-polynomials'
 
 extra-deps:
-- algebra-4.3.1
 - control-monad-loop-0.1
 - unamb-0.2.7
diff --git a/stack-9.2.1.yaml.lock b/stack-9.2.1.yaml.lock
diff --git a/stack-9.2.1.yaml → stack-9.2.2.yaml b/stack-9.2.1.yaml → stack-9.2.2.yaml
@@ -1,6 +1,4 @@
-resolver: nightly-2022-01-27
-compiler: ghc-9.2.1
-compiler-check: match-exact
+resolver: nightly-2022-03-19
 
 build:
   haddock-deps: false
@@ -22,15 +20,6 @@ packages:
 - 'halg-polyn-parser'
 - 'halg-polynomials'
 
-allow-newer: true
 extra-deps:
-- algebra-4.3.1
 - control-monad-loop-0.1
 - unamb-0.2.7
-- subcategories-0.2.0.0
-- base-compat-0.12.1
-- base-compat-batteries-0.12.1
-- th-desugar-1.13
-- lens-5.1
-- singletons-th-3.1
-- singletons-base-3.1