From 1b7f954dbf51ed5229d579bf7ed3d7ca3e996bfc Mon Sep 17 00:00:00 2001 From: Oleg Grenrus Date: Sun, 10 May 2026 20:27:17 +0300 Subject: [PATCH] tSupport GHC-9.14 --- .github/workflows/haskell-ci.yml | 86 ++++++++++++++++++++++++-------- bin/bin.cabal | 13 +++-- bin/src/Data/Type/Bin.hs | 28 +++++------ cabal.haskell-ci | 2 +- fin/fin.cabal | 11 ++-- fin/src/Data/Type/Nat.hs | 6 +-- fin/test/Inspection.hs | 10 +++- ral-lens/ral-lens.cabal | 7 +-- ral-optics/ral-optics.cabal | 7 +-- ral/ral.cabal | 9 ++-- tests/tests.cabal | 3 +- vec-lens/vec-lens.cabal | 7 +-- vec-optics/vec-optics.cabal | 7 +-- vec/bench/Bench.hs | 2 + vec/vec.cabal | 13 ++--- 15 files changed, 134 insertions(+), 77 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 1deba9d..9ff926b 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -8,9 +8,9 @@ # # For more information, see https://github.com/haskell-CI/haskell-ci # -# version: 0.19.20250330 +# version: 0.19.20260331 # -# REGENDATA ("0.19.20250330",["github","--config=cabal.haskell-ci","cabal.project"]) +# REGENDATA ("0.19.20260331",["github","--config=cabal.haskell-ci","cabal.project"]) # name: Haskell-CI on: @@ -20,6 +20,11 @@ on: pull_request: branches: - master + merge_group: + branches: + - master + workflow_dispatch: + {} jobs: linux: name: Haskell-CI - Linux - ${{ matrix.compiler }} @@ -32,14 +37,19 @@ jobs: strategy: matrix: include: + - compiler: ghc-9.14.1 + compilerKind: ghc + compilerVersion: 9.14.1 + setup-method: ghcup + allow-failure: false - compiler: ghc-9.12.2 compilerKind: ghc compilerVersion: 9.12.2 setup-method: ghcup allow-failure: false - - compiler: ghc-9.10.1 + - compiler: ghc-9.10.3 compilerKind: ghc - compilerVersion: 9.10.1 + compilerVersion: 9.10.3 setup-method: ghcup allow-failure: false - compiler: ghc-9.8.4 @@ -95,8 +105,8 @@ jobs: chmod a+x "$HOME/.ghcup/bin/ghcup" - name: Install cabal-install run: | - "$HOME/.ghcup/bin/ghcup" install cabal 3.14.1.1-p1 || (cat "$HOME"/.ghcup/logs/*.* && false) - echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.1.1-p1 -vnormal+nowrap" >> "$GITHUB_ENV" + "$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false) + echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV" - name: Install GHC (GHCup) if: matrix.setup-method == 'ghcup' run: | @@ -174,14 +184,14 @@ jobs: - name: install cabal-docspec run: | mkdir -p $HOME/.cabal/bin - curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20240703/cabal-docspec-0.0.0.20240703-x86_64-linux.xz > cabal-docspec.xz - echo '48bf3b7fd2f7f0caa6162afee57a755be8523e7f467b694900eb420f5f9a7b76 cabal-docspec.xz' | sha256sum -c - + curl -sL https://github.com/phadej/cabal-extras/releases/download/cabal-docspec-0.0.0.20250606/cabal-docspec-0.0.0.20250606-x86_64-linux.xz > cabal-docspec.xz + echo 'cc20bb5c19501b42bde77556bc419c7c0a5c8d1eb65663024d8a4e4c868bef25 cabal-docspec.xz' | sha256sum -c - xz -d < cabal-docspec.xz > $HOME/.cabal/bin/cabal-docspec rm -f cabal-docspec.xz chmod a+x $HOME/.cabal/bin/cabal-docspec cabal-docspec --version - name: checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: path: source - name: initial cabal.project for sdist @@ -238,23 +248,59 @@ jobs: echo "packages: ${PKGDIR_vec_optics}" >> cabal.project echo "packages: ${PKGDIR_tests}" >> cabal.project echo "package bin" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package fin" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package ral" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package vec" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package ral-lens" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package vec-lens" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package ral-optics" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package vec-optics" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project echo "package tests" >> cabal.project - echo " ghc-options: -Werror=missing-methods" >> cabal.project + echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package bin" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package fin" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package ral" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package vec" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package ral-lens" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package vec-lens" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package ral-optics" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package vec-optics" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "package tests" >> cabal.project ; fi + if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package bin" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package fin" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package ral" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package vec" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package ral-lens" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package vec-lens" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package ral-optics" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package vec-optics" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package tests" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=incomplete-patterns -Werror=incomplete-uni-patterns" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local @@ -285,8 +331,8 @@ jobs: $CABAL v2-test $ARG_COMPILER $ARG_TESTS $ARG_BENCH all --test-show-details=direct - name: docspec run: | - if [ $((HCNUMVER < 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all ; fi - if [ $((HCNUMVER < 90600)) -ne 0 ] ; then cabal-docspec $ARG_COMPILER ; fi + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then $CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH all ; fi + if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then cabal-docspec $ARG_COMPILER ; fi - name: cabal check run: | cd ${PKGDIR_bin} || false diff --git a/bin/bin.cabal b/bin/bin.cabal index 6864063..5e9dfe2 100644 --- a/bin/bin.cabal +++ b/bin/bin.cabal @@ -1,7 +1,6 @@ cabal-version: 2.2 name: bin -version: 0.1.4 -x-revision: 2 +version: 0.1.4.1 synopsis: Bin: binary natural numbers. category: Data, Dependent Types, Singletons, Math description: @@ -43,8 +42,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -68,7 +68,7 @@ library -- GHC boot libs build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , deepseq >=1.4.4.0 && <1.6 -- siblings @@ -77,10 +77,9 @@ library -- other dependencies build-depends: , boring ^>=0.2.2 - , dec ^>=0.0.6 , hashable ^>=1.4.4.0 || ^>=1.5.0.0 - , QuickCheck ^>=2.14.2 || ^>=2.15 - , some ^>=1.0.6 + , QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.18.0.0 + , some ^>=1.0.6 || ^>=1.1 if impl(ghc >=9.0) -- these flags may abort compilation with GHC-8.10 diff --git a/bin/src/Data/Type/Bin.hs b/bin/src/Data/Type/Bin.hs index fbbf613..8444ea4 100644 --- a/bin/src/Data/Type/Bin.hs +++ b/bin/src/Data/Type/Bin.hs @@ -220,7 +220,7 @@ type family ToGHC (b :: Bin) :: GHC.Nat where -- -- >>> :kind! FromGHC 7 -- FromGHC 7 :: Bin --- = 'BP ('B1 ('B1 'BE)) +-- = BP (B1 (B1 BE)) -- type family FromGHC (n :: GHC.Nat) :: Bin where FromGHC n = FromGHC' (GhcDivMod2 n) @@ -251,7 +251,7 @@ type family GhcDivMod2' (p :: (GHC.Nat, Bool)) :: (GHC.Nat, Bool) where -- -- >>> :kind! ToNat Bin5 -- ToNat Bin5 :: Nat --- = 'S ('S ('S ('S ('S 'Z)))) +-- = S (S (S (S (S Z)))) -- type family ToNat (b :: Bin) :: Nat where ToNat 'BZ = 'Z @@ -261,7 +261,7 @@ type family ToNat (b :: Bin) :: Nat where -- -- >>> :kind! FromNat N.Nat5 -- FromNat N.Nat5 :: Bin --- = 'BP ('B1 ('B0 'BE)) +-- = BP (B1 (B0 BE)) -- type family FromNat (n :: Nat) :: Bin where FromNat n = FromNat' (N.DivMod2 n) @@ -280,11 +280,11 @@ type family FromNat' (p :: (Nat, Bool)) :: Bin where -- -- >>> :kind! Mult2 Bin0 == Bin0 -- Mult2 Bin0 == Bin0 :: Bool --- = 'True +-- = True -- -- >>> :kind! Mult2 Bin3 == Bin6 -- Mult2 Bin3 == Bin6 :: Bool --- = 'True +-- = True -- type family Mult2 (b :: Bin) :: Bin where Mult2 'BZ = 'BZ @@ -294,11 +294,11 @@ type family Mult2 (b :: Bin) :: Bin where -- -- >>> :kind! Mult2Plus1 Bin0 -- Mult2Plus1 Bin0 :: BinP --- = 'BE +-- = BE -- -- >>> :kind! Mult2Plus1 Bin4 == BinP9 -- Mult2Plus1 Bin4 == BinP9 :: Bool --- = 'True +-- = True -- type family Mult2Plus1 (b :: Bin) :: BinP where Mult2Plus1 'BZ = 'BE @@ -312,7 +312,7 @@ type family Mult2Plus1 (b :: Bin) :: BinP where -- -- >>> :kind! Succ Bin5 -- Succ Bin5 :: Bin --- = 'BP ('B0 ('B1 'BE)) +-- = BP (B0 (B1 BE)) -- -- @ -- `Succ` :: 'Bin' -> 'Bin' @@ -343,19 +343,19 @@ withSucc' _ k = BP.withSucc (Proxy :: Proxy b) k -- -- >>> :kind! Pred BP.BinP1 -- Pred BP.BinP1 :: Bin --- = 'BZ +-- = BZ -- -- >>> :kind! Pred BP.BinP5 == Bin4 -- Pred BP.BinP5 == Bin4 :: Bool --- = 'True +-- = True -- -- >>> :kind! Pred BP.BinP8 == Bin7 -- Pred BP.BinP8 == Bin7 :: Bool --- = 'True +-- = True -- -- >>> :kind! Pred BP.BinP6 == Bin5 -- Pred BP.BinP6 == Bin5 :: Bool --- = 'True +-- = True -- type family Pred (b :: BinP) :: Bin where Pred 'BE = 'BZ @@ -375,11 +375,11 @@ type family Pred' (b :: BinP) :: BinP where -- -- >>> :kind! Plus Bin3 Bin3 == Bin6 -- Plus Bin3 Bin3 == Bin6 :: Bool --- = 'True +-- = True -- -- >>> :kind! Mult2 Bin3 == Bin6 -- Mult2 Bin3 == Bin6 :: Bool --- = 'True +-- = True -- type family Plus (a :: Bin) (b :: Bin) :: Bin where Plus 'BZ b = b diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 6b7e8ab..545a61b 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,7 +1,7 @@ branches: master -- GHC-9.6 doesn't print ticks -docspec: <9.6 +docspec: >=9.6 haddock: True haddock-components: libs diff --git a/fin/fin.cabal b/fin/fin.cabal index c4716e7..dd4d2e4 100644 --- a/fin/fin.cabal +++ b/fin/fin.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: fin version: 0.3.2 -x-revision: 1 +x-revision: 2 synopsis: Nat and Fin: peano naturals and finite numbers category: Data, Dependent Types, Singletons, Math description: @@ -65,8 +65,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -89,7 +90,7 @@ library -- GHC boot libs build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , deepseq >=1.4.4.0 && <1.6 -- other dependencies @@ -97,8 +98,8 @@ library , boring ^>=0.2.2 , dec ^>=0.0.6 , hashable ^>=1.4.4.0 || ^>=1.5.0.0 - , QuickCheck ^>=2.14.2 || ^>=2.15 - , some ^>=1.0.6 + , QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.18.0.0 + , some ^>=1.0.6 || ^>=1.1 , universe-base ^>=1.1.4 if impl(ghc >=9.0) diff --git a/fin/src/Data/Type/Nat.hs b/fin/src/Data/Type/Nat.hs index 04d9e23..17a98f0 100644 --- a/fin/src/Data/Type/Nat.hs +++ b/fin/src/Data/Type/Nat.hs @@ -411,7 +411,7 @@ type family ToGHC (n :: Nat) :: GHC.Nat where -- -- >>> :kind! FromGHC 7 -- FromGHC 7 :: Nat --- = 'S ('S ('S ('S ('S ('S ('S 'Z)))))) +-- = S (S (S (S (S (S (S Z)))))) -- type family FromGHC (n :: GHC.Nat) :: Nat where FromGHC 0 = 'Z @@ -450,11 +450,11 @@ type family Mult2 (n :: Nat) :: Nat where -- -- >>> :kind! DivMod2 Nat7 == '(Nat3, True) -- DivMod2 Nat7 == '(Nat3, True) :: Bool --- = 'True +-- = True -- -- >>> :kind! DivMod2 Nat4 == '(Nat2, False) -- DivMod2 Nat4 == '(Nat2, False) :: Bool --- = 'True +-- = True -- type family DivMod2 (n :: Nat) :: (Nat, Bool) where DivMod2 'Z = '( 'Z, 'False) diff --git a/fin/test/Inspection.hs b/fin/test/Inspection.hs index deec9c9..63df646 100644 --- a/fin/test/Inspection.hs +++ b/fin/test/Inspection.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE CPP #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GADTs #-} @@ -6,7 +7,7 @@ {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE TypeOperators #-} {-# OPTIONS_GHC -O -fplugin Test.Inspection.Plugin #-} -module Main (main) where +module Main where import Data.Fin (Fin (..)) import Data.Function (fix) @@ -88,7 +89,12 @@ lhsFold' = fix (foldrF (+) 0) [1,2,3,4] rhsFold :: Int rhsFold = 10 +#if __GLASGOW_HASKELL__ >=900 +inspect $ 'lhsFold =/= 'rhsFold -- TODO: report a bug +#else inspect $ 'lhsFold === 'rhsFold +#endif + inspect $ 'lhsFold' =/= 'rhsFold lhsUnfold :: (a -> a) -> a @@ -114,7 +120,7 @@ lhsPower5 = power (Proxy :: Proxy N.Nat5) rhsPower5 :: Int -> Int rhsPower5 k = k * k * k * k * k -inspect $ 'lhsPower5 === 'rhsPower5 +inspect $ 'lhsPower5 ==~ 'rhsPower5 ------------------------------------------------------------------------------- -- Main to make GHC happy diff --git a/ral-lens/ral-lens.cabal b/ral-lens/ral-lens.cabal index 039f5af..002224d 100644 --- a/ral-lens/ral-lens.cabal +++ b/ral-lens/ral-lens.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: ral-lens version: 0.2.1 -x-revision: 1 +x-revision: 2 synopsis: Length-indexed random access lists: lens utilities. category: Data, Dependent Types, Singletons, Lens description: @@ -26,8 +26,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -47,7 +48,7 @@ library Data.RAVec.Tree.Lens build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , bin ^>=0.1.4 , fin ^>=0.3.1 , lens ^>=5.2.2 || ^>=5.3.2 diff --git a/ral-optics/ral-optics.cabal b/ral-optics/ral-optics.cabal index 1df1625..ec8ad76 100644 --- a/ral-optics/ral-optics.cabal +++ b/ral-optics/ral-optics.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: ral-optics version: 0.2.1 -x-revision: 1 +x-revision: 2 synopsis: Length-indexed random access lists: optics utilities. category: Data, Dependent Types, Singletons, Optics description: @@ -26,8 +26,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -51,7 +52,7 @@ library Data.RAVec.NonEmpty.Optics.Internal build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , bin ^>=0.1.4 , fin ^>=0.3.1 , optics-core ^>=0.4.1.1 diff --git a/ral/ral.cabal b/ral/ral.cabal index fb184f3..db61148 100644 --- a/ral/ral.cabal +++ b/ral/ral.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: ral version: 0.2.2 -x-revision: 2 +x-revision: 3 synopsis: Random access lists category: Data, Dependent Types, Singletons description: @@ -38,8 +38,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -86,7 +87,7 @@ library -- GHC boot libs build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , deepseq >=1.4.4.0 && <1.6 -- siblings @@ -99,7 +100,7 @@ library , boring ^>=0.2.2 , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , indexed-traversable ^>=0.1.4 - , QuickCheck ^>=2.14.2 || ^>=2.15 + , QuickCheck ^>=2.14.2 || ^>=2.15 || ^>=2.18.0.0 if flag(distributive) build-depends: distributive ^>=0.6.2 diff --git a/tests/tests.cabal b/tests/tests.cabal index 0e4ce37..067e443 100644 --- a/tests/tests.cabal +++ b/tests/tests.cabal @@ -21,8 +21,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git diff --git a/vec-lens/vec-lens.cabal b/vec-lens/vec-lens.cabal index 0528754..4e76e9f 100644 --- a/vec-lens/vec-lens.cabal +++ b/vec-lens/vec-lens.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: vec-lens version: 0.4.1 -x-revision: 1 +x-revision: 2 synopsis: Vec: length-indexed (sized) list: lens support category: Data, Dependent Types, Lens description: @@ -29,8 +29,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -49,7 +50,7 @@ library Data.Vec.Pull.Lens -- GHC boot libs - build-depends: base >=4.12.0.0 && <4.22 + build-depends: base >=4.12.0.0 && <4.23 -- siblings build-depends: diff --git a/vec-optics/vec-optics.cabal b/vec-optics/vec-optics.cabal index 07cc8b8..87203ca 100644 --- a/vec-optics/vec-optics.cabal +++ b/vec-optics/vec-optics.cabal @@ -1,7 +1,7 @@ cabal-version: 2.2 name: vec-optics version: 0.4.1 -x-revision: 1 +x-revision: 2 synopsis: Vec: length-indexed (sized) list: optics support category: Data, Dependent Types, Optics description: @@ -29,8 +29,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -49,7 +50,7 @@ library Data.Vec.Pull.Optics -- GHC boot libs - build-depends: base >=4.12.0.0 && <4.22 + build-depends: base >=4.12.0.0 && <4.23 -- siblings build-depends: diff --git a/vec/bench/Bench.hs b/vec/bench/Bench.hs index 5540170..3d55760 100644 --- a/vec/bench/Bench.hs +++ b/vec/bench/Bench.hs @@ -36,12 +36,14 @@ xsp = P.Vec $ \i -> case i of FS (FS FZ) -> 3 FS (FS (FS FZ)) -> 4 FS (FS (FS (FS FZ))) -> 5 + _ -> -1 ysp = P.Vec $ \i -> case i of FZ -> 6 FS FZ -> 7 FS (FS FZ) -> 8 FS (FS (FS FZ)) -> 9 FS (FS (FS (FS FZ))) -> 0 + _ -> -1 main :: IO () main = defaultMain diff --git a/vec/vec.cabal b/vec/vec.cabal index a189f65..4516a6d 100644 --- a/vec/vec.cabal +++ b/vec/vec.cabal @@ -1,7 +1,6 @@ cabal-version: 2.2 name: vec -version: 0.5.1 -x-revision: 2 +version: 0.5.1.1 synopsis: Vec: length-indexed (sized) list category: Data, Dependent Types description: @@ -79,8 +78,9 @@ tested-with: || ==9.4.8 || ==9.6.6 || ==9.8.4 - || ==9.10.1 + || ==9.10.3 || ==9.12.2 + || ==9.14.1 source-repository head type: git @@ -122,9 +122,8 @@ library -- GHC boot libs build-depends: - , base >=4.12.0.0 && <4.22 + , base >=4.12.0.0 && <4.23 , deepseq >=1.4.4.0 && <1.6 - , transformers >=0.5.6.2 && <0.7 -- siblings build-depends: fin ^>=0.3.1 @@ -134,7 +133,7 @@ library , boring ^>=0.2.2 , hashable ^>=1.4.4.0 || ^>=1.5.0.0 , indexed-traversable ^>=0.1.4 - , QuickCheck ^>=2.14.2 || ^>=2.15.0.1 + , QuickCheck ^>=2.14.2 || ^>=2.15.0.1 || ^>=2.18.0.0 if flag(distributive) build-depends: distributive ^>=0.6.2 @@ -156,7 +155,6 @@ library -- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3295 ghc-options: -Winferred-safe-imports -Wmissing-safe-haskell-mode - x-docspec-extra-packages: void x-docspec-extra-packages: lens test-suite inspection @@ -173,7 +171,6 @@ test-suite inspection , base , fin , inspection-testing ^>=0.5.0.3 || ^>=0.6 - , tagged , vec benchmark bench