Merge branch 'ghc964' into 'master'

Support building with 9.6.6

See merge request !4

cabal.project

@@ -7,5 +7,3 @@ source-repository-package
     type: git
     location: https://gitlab.iscpif.fr/gargantext/patches-map/
     tag: 76cae88f367976ff091e661ee69a5c3126b94694
-
-with-compiler: ghc-8.10.7

patches-class.cabal

@@ -75,8 +75,8 @@ test-suite spec-patches-class
     Test.Data.Patch.Class
   build-depends:
       QuickCheck ^>= 2.14.2
-    , base ^>= 4.14.3
-    , hspec ^>= 2.7
+    , base >= 4.14.3 && < 5
+    , hspec >= 2.11 && < 2.12
     , patches-class
     , tasty ^>= 1.4.2.1
     , tasty-discover

src/Data/Patch/Class.hs

@@ -8,6 +8,8 @@ Stability   : experimental
 Portability : POSIX
 -}
 
+{-# LANGUAGE TypeOperators #-}
+
 module Data.Patch.Class
   ( -- Classes
     Patchable
@@ -391,7 +393,7 @@ instance (Diff a p, Diff b q) => Diff (a, b) (p, q) where
 -----------
 
 newtype PairPatch p q = PairPatch { _pairPatch :: (p, q) }
-  deriving (Eq, Ord, Show, Generic, Read,
+  deriving (Eq, Ord, Show, Generic, Read, Functor,
             Bifunctor, Bifoldable, Semigroup, Monoid, Group)
 
 instance Bitraversable PairPatch where
@@ -524,7 +526,7 @@ instance (Diff a p, Diff b q) => Diff (a, b) (PairPatch p q) where
 -------------
 
 newtype EitherPatch p q = EitherPatch { _eitherPatch :: (p, q) }
-  deriving (Eq, Ord, Show, Generic, Read,
+  deriving (Eq, Ord, Show, Generic, Read, Functor,
             Bifunctor, Bifoldable, Semigroup, Monoid, Group)
 
 leftPatch :: Lens (EitherPatch p q) (EitherPatch p' q) p p'