@@ -48,44 +48,64 @@ where
4848
4949import Prelude hiding ( readFile )
5050
51- import Control.Applicative hiding ( many
52- , some
51+ import Control.DeepSeq ( NFData )
52+ import Control.Monad ( guard
53+ , void
54+ , liftM2
55+ , msum
56+ , MonadPlus (mplus )
57+ )
58+ import Control.Monad.Combinators.Expr ( makeExprParser
59+ , Operator ( Postfix
60+ , InfixN
61+ , InfixR
62+ , Prefix
63+ , InfixL
64+ )
65+ )
66+ import Control.Monad.State.Strict ( evalState
67+ , MonadState (get , put )
68+ , State
5369 )
54- import Control.DeepSeq
55- import Control.Monad
56- import Control.Monad.Combinators.Expr
57- import Control.Monad.State.Strict
5870import Data.Char ( isAlpha
5971 , isDigit
6072 , isSpace
6173 )
6274import Data.Data ( Data (.. ) )
6375import Data.Fix ( Fix (.. ) )
64- import Data.Functor
76+ import Data.Functor ( ($>) )
6577import Data.HashSet ( HashSet )
6678import qualified Data.HashSet as HashSet
6779import Data.List.NonEmpty ( NonEmpty (.. ) )
6880import qualified Data.List.NonEmpty as NE
6981import qualified Data.Map as Map
70- import Data.Text hiding ( foldr1
71- , concat
72- , concatMap
73- , zipWith
82+ import Data.Text ( Text
83+ , cons
84+ , singleton
85+ , pack
7486 )
75- import Data.Text.Encoding
87+ import Data.Text.Encoding ( decodeUtf8 )
7688import Data.Typeable ( Typeable )
77- import Data.Void
78- import GHC.Generics hiding ( Prefix )
89+ import Data.Void ( Void )
90+ import GHC.Generics ( Generic )
7991import Nix.Expr hiding ( ($>) )
80- import Nix.Expr.Strings
81- import Nix.Render
92+ import Nix.Expr.Strings ( escapeCodes
93+ , stripIndent
94+ , mergePlain
95+ , removePlainEmpty
96+ )
97+ import Nix.Render ( MonadFile (readFile ) )
98+ import Nix.Utils ( bool )
8299import Prettyprinter ( Doc
83100 , pretty
84101 )
85102import Text.Megaparsec hiding ( State )
86- import Text.Megaparsec.Char
103+ import Text.Megaparsec.Char ( space1
104+ , string
105+ , letterChar
106+ , char
107+ )
87108import qualified Text.Megaparsec.Char.Lexer as L
88- import Nix.Utils ( bool )
89109
90110infixl 3 <+>
91111(<+>) :: MonadPlus m => m a -> m a -> m a
0 commit comments