@@ -7,6 +7,7 @@
77
88module Distribution.Nixpkgs.Haskell.FromCabal.Configuration ( Configuration(..), readConfiguration, assertConsistency ) where
99
10+import Control.Exception ( throwIO )
1011import Control.DeepSeq
1112import Control.Lens
1213import Control.Monad
@@ -94,7 +95,7 @@ parseKey s = either error id (parseEither parseJSON (String s))
9495
9596readConfiguration :: FilePath -> IO Configuration
9697readConfiguration path =
97− decodeFile path >>= maybe (fail ("invalid config file at " ++ show path)) assertConsistency
98+ decodeFileEither path >>= either throwIO assertConsistency
9899
99100assertConsistency :: Monad m => Configuration -> m Configuration
100101assertConsistency cfg@Configuration {..} = do