Expr.Types: org: mv TH instances to their types

This should ideally align TH inference & would help keep the code properly
structured & currently going to help me to understand what is going on with TH
inference in GHC 9.0.

Author: Anton-Latukha

src/Nix/Expr/Types.hs

@@ -146,6 +146,11 @@ data Params r
 instance IsString (Params r) where
   fromString = Param . fromString
 
+$(deriveShow1 ''Params)
+$(deriveRead1 ''Params)
+$(deriveEq1   ''Params)
+$(deriveOrd1  ''Params)
+
 -- *** Lens traversals
 
 $(makeTraversals ''Params)
@@ -179,6 +184,17 @@ instance Hashable2 Antiquoted where
   liftHashWithSalt2 _  _  salt EscapedNewline =     salt `hashWithSalt` (1 :: Int)
   liftHashWithSalt2 _  hb salt (Antiquoted b) = hb (salt `hashWithSalt` (2 :: Int)) b
 
+$(deriveShow1 ''Antiquoted)
+$(deriveShow2 ''Antiquoted)
+$(deriveRead1 ''Antiquoted)
+$(deriveRead2 ''Antiquoted)
+$(deriveEq1   ''Antiquoted)
+$(deriveEq2   ''Antiquoted)
+$(deriveOrd1  ''Antiquoted)
+$(deriveOrd2  ''Antiquoted)
+$(deriveJSON2 defaultOptions ''Antiquoted)
+
+
 -- *** Lens traversals
 
 $(makeTraversals ''Antiquoted)
@@ -219,6 +235,11 @@ instance IsString (NString r) where
   fromString ""     = DoubleQuoted mempty
   fromString string = DoubleQuoted [Plain $ toText string]
 
+$(deriveShow1 ''NString)
+$(deriveRead1 ''NString)
+$(deriveEq1   ''NString)
+$(deriveOrd1  ''NString)
+
 -- *** Lens traversals
 
 $(makeTraversals ''NString)
@@ -368,6 +389,11 @@ data Binding r
     , Show, Hashable, Hashable1
     )
 
+$(deriveShow1 ''Binding)
+$(deriveEq1   ''Binding)
+$(deriveOrd1  ''Binding)
+--x $(deriveJSON1 defaultOptions ''Binding)
+
 -- *** Lens traversals
 
 $(makeTraversals ''Binding)
@@ -533,6 +559,11 @@ data NExprF r
     )
 
 
+$(deriveShow1 ''NExprF)
+$(deriveEq1   ''NExprF)
+$(deriveOrd1  ''NExprF)
+--x $(deriveJSON1 defaultOptions ''NExprF)
+
 -- *** Lens traversals
 
 $(makeTraversals ''NExprF)
@@ -572,41 +603,6 @@ instance TH.Lift NExpr where
 #endif
 
 
--- ** Additional instances
-
-$(deriveShow1 ''Params)
-$(deriveShow1 ''Antiquoted)
-$(deriveShow2 ''Antiquoted)
-$(deriveShow1 ''NString)
-$(deriveShow1 ''Binding)
-$(deriveShow1 ''NExprF)
-
-$(deriveRead1 ''Params)
-$(deriveRead1 ''Antiquoted)
-$(deriveRead2 ''Antiquoted)
-$(deriveRead1 ''NString)
-
-$(deriveEq1 ''Params)
-$(deriveEq1 ''Antiquoted)
-$(deriveEq2 ''Antiquoted)
-$(deriveEq1 ''NString)
-$(deriveEq1 ''Binding)
-$(deriveEq1 ''NExprF)
-
-$(deriveOrd1 ''Params)
-$(deriveOrd1 ''Antiquoted)
-$(deriveOrd2 ''Antiquoted)
-$(deriveOrd1 ''NString)
-$(deriveOrd1 ''Binding)
-$(deriveOrd1 ''NExprF)
-
-$(deriveJSON2 defaultOptions ''Antiquoted)
---x $(deriveJSON1 defaultOptions ''Binding)
---x $(deriveJSON1 defaultOptions ''NExprF)
-
---x $(makeLenses ''Fix)
-
-
 -- ** Methods
 
 hashAt :: VarName -> Lens' (AttrSet v) (Maybe v)