diff --git a/changelog b/changelog --- a/changelog +++ b/changelog @@ -1,3 +1,7 @@ +1.1.4 + +* Support GHC-9.6.5..9.10.1 + 1.1.3 * Add Solo instances diff --git a/src/Data/Universe/Class.hs b/src/Data/Universe/Class.hs --- a/src/Data/Universe/Class.hs +++ b/src/Data/Universe/Class.hs @@ -1,14 +1,8 @@ -{-# LANGUAGE CPP, BangPatterns, TypeFamilies, ScopedTypeVariables #-} +{-# LANGUAGE CPP #-} +{-# LANGUAGE BangPatterns, TypeFamilies, ScopedTypeVariables #-} {-# LANGUAGE FlexibleContexts #-} -#ifdef DEFAULT_SIGNATURES {-# LANGUAGE DefaultSignatures #-} -#endif -{-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >=704 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >=702 -{-# LANGUAGE Trustworthy #-} -#endif -- | Bottoms are ignored for this entire module: -- only fully-defined inhabitants are considered inhabitants. module Data.Universe.Class @@ -52,13 +46,8 @@ import GHC.Tuple (Solo (Solo)) #define MkSolo Solo #else -#if MIN_VERSION_OneTuple(0,4,0) import Data.Tuple.Solo (Solo (MkSolo)) -#else -import Data.Tuple.Solo (Solo (Solo)) -#define MkSolo Solo #endif -#endif -- $setup -- >>> import Data.List @@ -83,10 +72,8 @@ -- @ class Universe a where universe :: [a] -#ifdef DEFAULT_SIGNATURES default universe :: (Enum a, Bounded a) => [a] universe = universeDef -#endif -- | Creating an instance of this class is a declaration that your 'universe' -- eventually ends. Minimal definition: no methods defined. By default, diff --git a/src/Data/Universe/Generic.hs b/src/Data/Universe/Generic.hs --- a/src/Data/Universe/Generic.hs +++ b/src/Data/Universe/Generic.hs @@ -1,11 +1,6 @@ -{-# LANGUAGE CPP #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleContexts #-} -#if __GLASGOW_HASKELL__ >=704 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >=702 -{-# LANGUAGE Trustworthy #-} -#endif module Data.Universe.Generic where import GHC.Generics @@ -73,7 +68,6 @@ universeGeneric :: (Generic a, GUniverse (Rep a)) => [a] universeGeneric = map to guniverse -#if __GLASGOW_HASKELL__ >= 804 -- $empty -- -- >>> :set -XEmptyDataDeriving @@ -81,4 +75,3 @@ -- >>> data Zero deriving (Show, Generic) -- >>> universeGeneric :: [Zero] -- [] -#endif diff --git a/src/Data/Universe/Helpers.hs b/src/Data/Universe/Helpers.hs --- a/src/Data/Universe/Helpers.hs +++ b/src/Data/Universe/Helpers.hs @@ -1,9 +1,4 @@ -{-# LANGUAGE CPP #-} -#if __GLASGOW_HASKELL__ >=704 {-# LANGUAGE Safe #-} -#elif __GLASGOW_HASKELL__ >=702 -{-# LANGUAGE Trustworthy #-} -#endif module Data.Universe.Helpers ( -- | This module is for functions that are useful for writing instances, -- but not necessarily for using them (and hence are not exported by the diff --git a/universe-base.cabal b/universe-base.cabal --- a/universe-base.cabal +++ b/universe-base.cabal @@ -1,5 +1,6 @@ +cabal-version: 2.2 name: universe-base -version: 1.1.3.1 +version: 1.1.4 synopsis: A class for finite and recursively enumerable types. description: A class for finite and recursively enumerable types and some helper functions for enumerating them. @@ -14,40 +15,29 @@ For more instances check @universe-instances-*@ packages. homepage: https://github.com/dmwit/universe -license: BSD3 +license: BSD-3-Clause license-file: LICENSE author: Daniel Wagner maintainer: me@dmwit.com copyright: 2014 Daniel Wagner category: Data build-type: Simple -cabal-version: >=1.10 extra-source-files: changelog tested-with: - GHC ==7.0.4 - || ==7.4.2 - || ==7.6.3 - || ==7.8.4 - || ==7.10.3 - || ==8.0.2 - || ==8.2.2 - || ==8.4.4 - || ==8.6.5 + GHC ==8.6.5 || ==8.8.4 || ==8.10.7 || ==9.0.2 - || ==9.2.7 - || ==9.4.4 - || ==9.6.1 + || ==9.2.8 + || ==9.4.8 + || ==9.6.5 + || ==9.8.2 + || ==9.10.1 source-repository head type: git location: https://github.com/dmwit/universe - -source-repository this - type: git - location: https://github.com/dmwit/universe - tag: instances-extended-1.1 + subdir: universe-base library default-language: Haskell2010 @@ -55,51 +45,29 @@ exposed-modules: Data.Universe.Class Data.Universe.Helpers - - if impl(ghc >=7.2) - exposed-modules: Data.Universe.Generic - - if impl(ghc <7.6) - build-depends: ghc-prim + Data.Universe.Generic other-extensions: BangPatterns - CPP + DefaultSignatures GADTs ScopedTypeVariables TypeFamilies build-depends: - base >=4.3 && <4.19 - , containers >=0.4.0.0 && <0.7 - , tagged >=0.8.6.1 && <0.9 - , transformers >=0.3.0.0 && <0.7 - - if impl(ghc >=7.10.3) - build-depends: transformers >=0.4.2.0 - - if !impl(ghc >=7.10.3) - build-depends: transformers-compat >=0.6.1 && <0.8 - - if !impl(ghc >=7.10) - build-depends: - nats >=1.1.2 && <1.2 - , void >=0.7.3 && <0.8 - - if !impl(ghc >=8.0) - build-depends: semigroups >=0.18.5 && <0.21 - - if impl(ghc >=7.4) - cpp-options: -DDEFAULT_SIGNATURES - other-extensions: DefaultSignatures + base >=4.12 && <4.21 + , containers >=0.6.0.1 && <0.8 + , tagged >=0.8.8 && <0.9 + , transformers >=0.5.6.2 && <0.7 - if !impl(ghc >= 9.2) - if impl(ghc >= 9.0) + if !impl(ghc >=9.2) + if impl(ghc >=9.0) build-depends: ghc-prim + else - build-depends: OneTuple >=0.3 && <0.5 + build-depends: OneTuple >=0.4.2 && <0.5 - if impl(ghc >= 9.0) + if impl(ghc >=9.0) -- these flags may abort compilation with GHC-8.10 -- https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3295 ghc-options: -Winferred-safe-imports -Wmissing-safe-haskell-mode @@ -114,8 +82,5 @@ build-depends: base , containers - , QuickCheck >=2.8.2 && <2.15 + , QuickCheck >=2.8.2 && <2.16 , universe-base - - if !impl(ghc >=7.10) - build-depends: nats