From 179c3617605c87daaac9f88ea81146c41e54f602 Mon Sep 17 00:00:00 2001 From: Hiromi Ishii Date: Sun, 20 Mar 2022 15:35:05 +0900 Subject: [PATCH] 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 --- .github/dhall/haskell.dhall | 2 +- .github/workflows/haskell.yml | 4 +- algebraic-prelude/algebraic-prelude.cabal | 2 +- algebraic-prelude/package.yaml | 2 +- halg-core/src/Algebra/Ring/Ideal.hs | 3 +- .../src/Algebra/Ring/Polynomial/Univariate.hs | 2 +- stack-9.0.2.yaml | 4 +- stack-9.2.1.yaml.lock | 82 ------------------- stack-9.2.1.yaml => stack-9.2.2.yaml | 13 +-- 9 files changed, 9 insertions(+), 105 deletions(-) delete mode 100644 stack-9.2.1.yaml.lock rename stack-9.2.1.yaml => stack-9.2.2.yaml (60%) diff --git a/.github/dhall/haskell.dhall b/.github/dhall/haskell.dhall index 97a495a3..30feeb3a 100644 --- 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 index 13bdf639..6df9fd75 100644 --- 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 index 466d3505..dc91ed86 100644 --- 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 index 087b8915..995dcdfe 100644 --- 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 index 2c143c70..bcefbd68 100644 --- 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 index 5356e8ea..01da5e25 100644 --- 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 index a7f1f7ff..a0366d84 100644 --- 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 deleted file mode 100644 index bd72ad35..00000000 --- a/stack-9.2.1.yaml.lock +++ /dev/null @@ -1,82 +0,0 @@ -# This file was autogenerated by Stack. -# You should not edit this file by hand. -# For more information, please see the documentation at: -# https://docs.haskellstack.org/en/stable/lock_files - -packages: -- completed: - hackage: algebra-4.3.1@sha256:323cf20c508e0b71422b767ff3a89e4188f68aa59b2df9d0fe6e9f9bae7938fb,4129 - pantry-tree: - size: 5556 - sha256: 2dea7d23304c09c902fb1f90f45b1b22df6ded47fb717742cca119f9f3667b21 - original: - hackage: algebra-4.3.1 -- completed: - hackage: control-monad-loop-0.1@sha256:2b8d9fbc6e53f2c8f679188952b90f2c69507d1c1efd8867beb64591a22b341c,1106 - pantry-tree: - size: 466 - sha256: e0bb7221ac929e5fe3722f4838551e962589a8fed18199d9791385864855f466 - original: - hackage: control-monad-loop-0.1 -- completed: - hackage: unamb-0.2.7@sha256:ce5db0575bca8ca04c9e9dce3ba75b6f9e5ceea834c6ba4fae45aca6fa963334,2385 - pantry-tree: - size: 217 - sha256: c3c4ac7408c2999b6779714459d2433ff2495f90161d7c3ca349ca3aa6386be8 - original: - hackage: unamb-0.2.7 -- completed: - hackage: subcategories-0.2.0.0@sha256:736384d15702a57c1cf96990f4e092210f483bf9c86a1a544ac41a7a23c61173,3545 - pantry-tree: - size: 1609 - sha256: 3aeec6dd897c1d8978f4711cb3785f11fe97cdb7667acbc32722e53d1c4f242b - original: - hackage: subcategories-0.2.0.0 -- completed: - hackage: base-compat-0.12.1@sha256:20e50848d9dfee1523fafe8950060b04fae43d402c15553da5c7cacd116f7846,6960 - pantry-tree: - size: 9038 - sha256: 2f2c14615443954f117613d77835234b598718e611fb4cf4522e01980bf1bcbd - original: - hackage: base-compat-0.12.1 -- completed: - hackage: base-compat-batteries-0.12.1@sha256:ee819d7570b2fda1012d29db945a1778c388ef8c0c282e45c8fe4eae7616a25c,8891 - pantry-tree: - size: 11169 - sha256: 64edb51a988b4a362f0ba4172ad4e3d140ee69129dd68a4d08004fe506cc09ae - original: - hackage: base-compat-batteries-0.12.1 -- completed: - hackage: th-desugar-1.13@sha256:7da1786474f9ad4f5ae9b935f8c36d8e881bac33d07b7963094acbb967fa6ee5,3793 - pantry-tree: - size: 1675 - sha256: 432b0e1cc6cf96c51f027bc32d4e27439227c50d16b6121716648c6cde160ed1 - original: - hackage: th-desugar-1.13 -- completed: - hackage: lens-5.1@sha256:2cd46b613b9fb37e6eb64c518fd41cfdf55b15bd217d8780163b5c75974920bf,15013 - pantry-tree: - size: 8214 - sha256: a01b10a8b32e7aeb1e4fbb922761a3f9a8f28bb9d2270277b849984409aca067 - original: - hackage: lens-5.1 -- completed: - hackage: singletons-th-3.1@sha256:5f7b1374c0f30f470a24811872cce210011f8402ce5130b6ef55098523f8dc3f,4605 - pantry-tree: - size: 2538 - sha256: 7e6c348c2da9c79b72af45b853fbe1ef6b3ec594833774eede790265c8e7e815 - original: - hackage: singletons-th-3.1 -- completed: - hackage: singletons-base-3.1@sha256:c7c83b0da1ad6f02129d900ca8feaf6ae463a73b1935bdc199cfbacf14db31a1,7073 - pantry-tree: - size: 24785 - sha256: 83587d2a7944c02ec199421d9a93d07b64025ac6170ac5f11211e847f064a4f7 - original: - hackage: singletons-base-3.1 -snapshots: -- completed: - size: 631483 - url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/1/27.yaml - sha256: 9fd3a84e21a00cbd62abe0cfd8e3620d8014272d27b9357dfe27704270d49624 - original: nightly-2022-01-27 diff --git a/stack-9.2.1.yaml b/stack-9.2.2.yaml similarity index 60% rename from stack-9.2.1.yaml rename to stack-9.2.2.yaml index 51514e79..a6349fb1 100644 --- a/stack-9.2.1.yaml +++ b/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