update for LTS-20.4

src/Roboservant/Types.hs

@@ -14,7 +14,6 @@ module Roboservant.Types
     module Roboservant.Types.ReifiedApi.Server,
     module Roboservant.Types.Internal,
     module Roboservant.Types.Config,
-    module Roboservant.Types.Orphans,
   )
 where
 

src/Roboservant/Types/Breakdown.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE DerivingVia #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
@@ -48,7 +49,7 @@ instance (Hashable x, Typeable x, Breakdown x) => Breakdown [x] where
   breakdownExtras stash =  concatMap (NEL.toList . breakdown) stash
 
 
-class GBreakdown (f :: k -> *) where
+class GBreakdown (f :: k -> Type) where
   gBreakdownExtras :: f a -> [(Dynamic, Int)]
 
 instance (Hashable x, Typeable x, Generic x, GBreakdown (Rep x)) => Breakdown (Compound (x :: Type)) where

src/Roboservant/Types/BuildFrom.hs

@@ -77,7 +77,7 @@ deriving via (Atom Int) instance BuildFrom Int
 
 deriving via (Atom Char) instance BuildFrom Char
 
-class GBuildFrom (f :: k -> *) where
+class GBuildFrom (f :: k -> Type) where
   gExtras :: Stash -> [([Provenance], f a)]
 
 instance GBuildFrom b => GBuildFrom (M1 D a b) where

src/Roboservant/Types/Internal.hs

@@ -43,11 +43,11 @@ instance Show Stash where
 
 -- | Can't be built up from parts, can't be broken down further.
 newtype Atom x = Atom {unAtom :: x}
-  deriving newtype (Hashable, Typeable)
+  deriving newtype (Hashable, Typeable,Eq)
 
 -- | can be broken down and built up from generic pieces
 newtype Compound x = Compound {unCompound :: x}
-  deriving newtype (Hashable, Typeable)
+  deriving newtype (Hashable, Typeable, Eq)
 
 hashedDyn :: (Hashable a, Typeable a) => a -> (Dynamic, Int)
 hashedDyn a = (toDyn a, hash a)

src/Roboservant/Types/ReifiedApi.hs

@@ -57,7 +57,7 @@ instance Show ReifiedEndpoint where
 
 class ( V.RecordToList (EndpointArgs endpoint)
       , V.RMap (EndpointArgs endpoint)
-      ) => ToReifiedEndpoint (endpoint :: *) where
+      ) => ToReifiedEndpoint (endpoint :: Type) where
   type EndpointArgs endpoint :: [Type]
   type EndpointRes endpoint :: Type
 

stack.yaml

@@ -1,10 +1,10 @@
-resolver: lts-17.6
+resolver: lts-20.4
 packages:
 - .
 
 extra-deps:
-- dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
+# - dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
-- dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
+# - dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
 - servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
-- constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
+# - constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
-- some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
+- some-1.0.3

stack.yaml.lock

@@ -4,44 +4,23 @@
 #   https://docs.haskellstack.org/en/stable/lock_files
 
 packages:
-- completed:
-    hackage: dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
-    pantry-tree:
-      size: 551
-      sha256: 5defa30010904d2ad05a036f3eaf83793506717c93cbeb599f40db1a3632cfc5
-  original:
-    hackage: dependent-map-0.4.0.0@sha256:ca2b131046f4340a1c35d138c5a003fe4a5be96b14efc26291ed35fd08c62221,1657
-- completed:
-    hackage: dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
-    pantry-tree:
-      size: 290
-      sha256: 9cbfb32b5a8a782b7a1c941803fd517633cb699159b851c1d82267a9e9391b50
-  original:
-    hackage: dependent-sum-0.7.1.0@sha256:5599aa89637db434431b1dd3fa7c34bc3d565ee44f0519bfbc877be1927c2531,2068
 - completed:
     hackage: servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
     pantry-tree:
-      size: 325
       sha256: 04f12c7bef2c3f9a25d94eb9489752ed498db8e243069fe95838dbb51df1dcb3
+      size: 325
   original:
     hackage: servant-flatten-0.2@sha256:276896f7c5cdec5b8f8493f6205fded0cc602d050b58fdb09a6d7c85c3bb0837,1234
 - completed:
-    hackage: constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
+    hackage: some-1.0.3@sha256:938cec5fc0d3a08dde34cfc0acd5a0aa2e9fd489c9dbb64417f16588dfb47af0,2399
     pantry-tree:
-      size: 594
+      sha256: b88dddc6b991cd570c6750f8d309a9feb76938b29a690abdabc4ababb8c7b2f8
-      sha256: 3ce1012bfb02e4d7def9df19ce80b8cd2b472c691b25b181d9960638673fecd1
+      size: 709
   original:
-    hackage: constraints-extras-0.3.0.2@sha256:013b8d0392582c6ca068e226718a4fe8be8e22321cc0634f6115505bf377ad26,1853
+    hackage: some-1.0.3
-- completed:
-    hackage: some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
-    pantry-tree:
-      size: 708
-      sha256: c882b6ebe8a0616f1ab3908f1620087ad5c6d8d82d1a72b99226f6487419bfe6
-  original:
-    hackage: some-1.0.1@sha256:26e5bab7276f48b25ea8660d3fd1166c0f20fd497dac879a40f408e23211f93e,2055
 snapshots:
 - completed:
-    size: 565712
+    sha256: 3770dfd79f5aed67acdcc65c4e7730adddffe6dba79ea723cfb0918356fc0f94
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/17/6.yaml
+    size: 648660
-    sha256: 4e5e581a709c88e3fe26a9ce8bf331435729bead762fb5c190064c6c5bb1b835
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/20/4.yaml
-  original: lts-17.6
+  original: lts-20.4

test/Valid.hs

@@ -10,7 +10,6 @@ module Valid where
 import Data.Void
 import GHC.Generics
 import Servant
-import Servant.API.Generic
 import Servant.Server.Generic
 
 type Api =