Skip to content

Commit d3532a3

Browse files
committed
move instance MonadFile Fix1T to the parent
1 parent 902e6dd commit d3532a3

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

src/Nix/Render.hs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{-# LANGUAGE UndecidableInstances #-}
12
{-# LANGUAGE CPP #-}
23
{-# LANGUAGE ConstraintKinds #-}
34
{-# LANGUAGE DefaultSignatures #-}
@@ -23,6 +24,8 @@ import qualified Data.Set as Set
2324
import qualified Data.Text as T
2425
import qualified Data.Text.Encoding as T
2526
import Data.Void
27+
import Nix.Utils.Fix1 ( Fix1T
28+
, MonadFix1T )
2629
import Nix.Expr.Types.Annotated
2730
import Prettyprinter
2831
import qualified System.Directory as S
@@ -70,6 +73,9 @@ instance MonadFile IO where
7073
doesDirectoryExist = S.doesDirectoryExist
7174
getSymbolicLinkStatus = S.getSymbolicLinkStatus
7275

76+
77+
instance (MonadFix1T t m, MonadFail (Fix1T t m), MonadFile m) => MonadFile (Fix1T t m)
78+
7379
posAndMsg :: SourcePos -> Doc a -> ParseError s Void
7480
posAndMsg (SourcePos _ lineNo _) msg = FancyError
7581
(unPos lineNo)

src/Nix/Standard.hs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ import Nix.Value.Monad
5252
import Nix.Var
5353

5454

55-
instance (MonadFix1T t m, MonadFail (Fix1T t m), MonadFile m) => MonadFile (Fix1T t m)
56-
5755
instance (MonadFix1T t m, MonadStore m) => MonadStore (Fix1T t m) where
5856
addToStore a b c d = lift $ addToStore a b c d
5957
addTextToStore' a b c d = lift $ addTextToStore' a b c d

0 commit comments

Comments
 (0)