Merge branch 'master' into ghc-8.8

This commit is contained in:
Tom Harding 2021-01-24 17:34:17 +00:00 committed by GitHub
commit da392f56a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 9 deletions

9
cabal.project Normal file
View File

@ -0,0 +1,9 @@
packages: .
with-compiler: ghc-8.8.3
source-repository-package
type: git
location: https://github.com/AlistairB/generic-lens.git
tag: e9fe04b049aa62c4489014537a4e2a0cf8644c79
subdir: generic-lens-core

View File

@ -25,29 +25,30 @@ library
-- other-modules:
-- other-extensions:
build-depends: base >= 4.12 && < 5
, barbies ^>= 2.0.0
, generic-lens ^>= 1.1.0
, barbies ^>= 2.0
, generic-lens ^>= 2.0
, generic-lens-core ^>= 2.0
, QuickCheck >= 2.12.6 && < 2.14
, named ^>= 0.3.0.0
hs-source-dirs: src
default-language: Haskell2010
test-suite test
build-depends: base >= 4.12 && < 5
, barbies ^>= 2.0.0
build-depends: base
, barbies
, doctest ^>= 0.16.0
, higgledy
, hspec >= 2.6.1 && < 2.8
, lens >= 4.17 && < 5
, QuickCheck >= 2.12.6 && < 2.14
, QuickCheck
main-is: Main.hs
type: exitcode-stdio-1.0
hs-source-dirs: test
default-language: Haskell2010
test-suite readme
build-depends: base >= 4.12 && < 5
, barbies ^>= 2.0.0
build-depends: base
, barbies
, lens >= 4.17 && < 5
, higgledy
, named ^>= 0.3.0.0

View File

@ -25,7 +25,7 @@ module Data.Generic.HKD.Build
) where
import Data.Kind (Type)
import Data.GenericLens.Internal (HList (..))
import Data.Generics.Product.Internal.HList (HList (..))
import Data.Generic.HKD.Types (HKD (..), GHKD_)
import GHC.Generics
import Prelude hiding (uncurry)

View File

@ -28,7 +28,7 @@ module Data.Generic.HKD.Named
import Data.Functor.Contravariant (Contravariant (..))
import Data.Generic.HKD.Types (HKD, HKD_)
import Data.GenericLens.Internal (GUpcast (..))
import Data.Generics.Product.Internal.Subtype (GUpcast (..))
import Data.Kind (Type)
import GHC.Generics
import Named ((:!), NamedF (..))