import clean-up

Author: Anton-Latukha

src/Nix/Cited/Basic.hs

@@ -14,7 +14,7 @@ import           Nix.Cited
 import           Nix.Eval                      as Eval
                                                 ( EvalFrame(EvaluatingExpr,ForcingExpr) )
 import           Nix.Exec
-import           Nix.Expr
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Options
 import           Nix.Thunk

src/Nix/Effects.hs

@@ -26,7 +26,7 @@ import           Network.HTTP.Client.TLS
 import           Network.HTTP.Types
 import qualified "cryptonite" Crypto.Hash      as Hash
 import           Nix.Utils.Fix1
-import           Nix.Expr
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames              hiding ( Proxy )
 import           Nix.Parser
 import           Nix.Render

src/Nix/Effects/Basic.hs

@@ -21,7 +21,8 @@ import           Nix.Exec                       ( MonadNix
                                                 , evalExprLoc
                                                 , nixInstantiateExpr
                                                 )
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Parser
 import           Nix.Render

src/Nix/Eval.hs

@@ -15,7 +15,8 @@ import           Data.List                      ( partition )
 import           Data.These                     ( These(..) )
 import           Nix.Atoms
 import           Nix.Convert
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Expr.Strings               ( runAntiquoted )
 import           Nix.Frames
 import           Nix.String

src/Nix/Exec.hs

@@ -29,7 +29,8 @@ import           Nix.Cited
 import           Nix.Convert
 import           Nix.Effects
 import           Nix.Eval                      as Eval
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Options
 import           Nix.Pretty

src/Nix/Lint.hs

@@ -32,7 +32,8 @@ import           Nix.Context
 import           Nix.Convert
 import           Nix.Eval                       ( MonadEval(..) )
 import qualified Nix.Eval                      as Eval
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Fresh
 import           Nix.String

src/Nix/Pretty.hs

@@ -23,7 +23,8 @@ import qualified Data.Text                     as Text
 import           Prettyprinter           hiding ( list )
 import           Nix.Atoms
 import           Nix.Cited
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Expr.Strings
 import           Nix.Normal
 import           Nix.Parser

src/Nix/Reduce.hs

@@ -42,7 +42,8 @@ import qualified Data.List.NonEmpty            as NE
 import qualified Text.Show
 import           Nix.Atoms
 import           Nix.Effects.Basic              ( pathToDefaultNixFile )
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Options                    ( Options
                                                 , reduceSets

src/Nix/Render/Frame.hs

@@ -15,7 +15,8 @@ import           Nix.Utils
 import           Data.Fix                   ( Fix(..) )
 import           Nix.Eval
 import           Nix.Exec
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Frames
 import           Nix.Normal
 import           Nix.Options

src/Nix/TH.hs

@@ -12,7 +12,8 @@ import           Language.Haskell.TH
 import qualified Language.Haskell.TH.Syntax    as TH
 import           Language.Haskell.TH.Quote
 import           Nix.Atoms
-import           Nix.Expr
+import           Nix.Expr.Types
+import           Nix.Expr.Types.Annotated
 import           Nix.Parser
 
 quoteExprExp :: String -> ExpQ