Merge #963: Minor updates

Author: Anton-Latukha

src/Nix/Expr/Types.hs

@@ -376,7 +376,7 @@ data NRecordType
 
 instance Serialise NRecordType
 
--- * @NExprF@ - Nix expressions, base functor
+-- ** @NExprF@ - Nix expressions, base functor
 
 -- | The main Nix expression type. As it is polimophic, has a functor,
 -- which allows to traverse expressions and map functions over them.
@@ -507,7 +507,7 @@ instance TH.Lift NExpr where
           pure [| $(TH.lift b) |]
       )
 #if MIN_VERSION_template_haskell(2,17,0)
-  liftTyped = unsafeCodeCoerce . lift
+  liftTyped = TH.liftTyped
 #elif MIN_VERSION_template_haskell(2,16,0)
   liftTyped = TH.unsafeTExpCoerce . TH.lift
 #endif

src/Nix/Thunk.hs

@@ -6,6 +6,7 @@ module Nix.Thunk where
 
 import           Control.Monad.Trans.Writer ( WriterT )
 import qualified Text.Show
+import qualified Data.Kind
 
 
 -- ** @class MonadThunkId@ & @instances@
@@ -19,7 +20,7 @@ class
   )
   => MonadThunkId m
  where
-  type ThunkId m :: *
+  type ThunkId m :: Data.Kind.Type
 
   freshId :: m (ThunkId m)
   default freshId