move instances {From,To}JSON NAtom to the parent

Author: Anton-Latukha

src/Nix/Atoms.hs

@@ -18,6 +18,7 @@ import           Data.Text                      ( Text
                                                 )
 import           GHC.Generics
 import           Data.Binary                    ( Binary )
+import           Data.Aeson.Types               ( FromJSON, ToJSON )
 
 -- | Atoms are values that evaluate to themselves. This means that
 -- they appear in both the parsed AST (in the form of literals) and
@@ -42,6 +43,8 @@ instance Serialise NAtom
 #endif
 
 instance Binary NAtom
+instance ToJSON NAtom
+instance FromJSON NAtom
 
 -- | Translate an atom into its nix representation.
 atomText :: NAtom -> Text

src/Nix/Expr/Types.hs

@@ -537,7 +537,6 @@ instance ToJSON Pos where
 instance ToJSON SourcePos
 instance ToJSON a => ToJSON (NKeyName a)
 instance ToJSON a => ToJSON (Params a)
-instance ToJSON NAtom
 instance ToJSON NUnaryOp
 instance ToJSON NBinaryOp
 instance ToJSON NRecordType
@@ -551,7 +550,6 @@ instance FromJSON Pos where
 instance FromJSON SourcePos
 instance FromJSON a => FromJSON (NKeyName a)
 instance FromJSON a => FromJSON (Params a)
-instance FromJSON NAtom
 instance FromJSON NUnaryOp
 instance FromJSON NBinaryOp
 instance FromJSON NRecordType