diff --git a/.gitignore b/.gitignore index ead7383..5347f7e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ build test-output cabal-dev dstroot +tags +/.hsenv/ diff --git a/Kit/Contents.hs b/Kit/Contents.hs index 2498793..c7bc7e7 100644 --- a/Kit/Contents.hs +++ b/Kit/Contents.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PackageImports #-} module Kit.Contents ( KitContents(..), readKitContents, @@ -29,7 +28,7 @@ instance Packageable KitContents where packageVersion = packageVersion . contentSpec namedPrefix :: KitContents -> Maybe String -namedPrefix kc = fmap (\s -> "//" ++ (packageFileName kc) ++ "\n" ++ s) $ contentPrefix kc +namedPrefix kc = fmap (\s -> "//" ++ packageFileName kc ++ "\n" ++ s) $ contentPrefix kc readKitContents :: (Applicative m, MonadIO m) => AbsolutePath -> KitSpec -> m KitContents readKitContents absKitDir spec = diff --git a/Kit/Util.hs b/Kit/Util.hs index 3b5db1f..5f0ce5e 100644 --- a/Kit/Util.hs +++ b/Kit/Util.hs @@ -6,12 +6,11 @@ module Kit.Util( module Control.Monad, module System.Directory, module System.FilePath.Posix, - module Debug.Trace, module Control.Monad.Trans, Color(..), (>>>) ) where - import Debug.Trace + import System.Directory import System.FilePath.Posix import System.FilePath.Glob (globDir1, compile) @@ -26,8 +25,8 @@ module Kit.Util( import Control.Arrow import Control.Applicative import Control.Monad - import "mtl" Control.Monad.Error - import "mtl" Control.Monad.Trans + import Control.Monad.Error + import Control.Monad.Trans import System.Cmd import System.Console.ANSI