@@ -9,10 +9,13 @@ module Distribution.Nixpkgs.Haskell.FromCabal.Configuration
99 )
1010 where
1111
12+import Prelude hiding ( fail )
13+
1214import Control.DeepSeq
1315import Control.Exception ( throwIO )
1416import Control.Lens
15−import Control.Monad
17+import Control.Monad hiding ( fail )
18+import Control.Monad.Fail
1619import Data.Aeson
1720import Data.Map as Map
1821import Data.Set as Set
@@ -91,7 +94,7 @@ parseKey s = either error id (parseEither parseJSON (String s))
9194readConfiguration :: FilePath -> IO Configuration
9295readConfiguration path = decodeFileEither path >>= either throwIO assertConsistency
9396
94−assertConsistency :: Monad m => Configuration -> m Configuration
97+assertConsistency :: MonadFail m => Configuration -> m Configuration
9598assertConsistency cfg@Configuration {..} = do
9699 let report msg = fail ("*** configuration error: " ++ msg)
97100 maintainedPackages = Set.unions (Map.elems packageMaintainers)