ghc-imported-from 0.3.0.2 → 0.3.0.3

raw patch · 4 files changed

+20/−14 lines, 4 filesdep ~process-streaming

Dependency ranges changed: process-streaming

Files

• Language/Haskell/GhcImportedFrom.hs +7/−7
• changelog.md +5/−0
• ghc-imported-from.cabal +5/−5
• stack.yaml +3/−2

@@ -129,9 +129,9 @@     -- GHC API and ghc-pkg have inconsistencies in the naming of options, see <http://www.vex.net/~trebla/haskell/sicp.xhtml> for more details.     = GhcOptions [String] deriving (Show) -instance Monoid GhcOptions where-    mempty  = GhcOptions []-    (GhcOptions g) `mappend` (GhcOptions h) = GhcOptions $ g ++ h+--instance Monoid GhcOptions where+--    mempty  = GhcOptions []+--    (GhcOptions g) `mappend` (GhcOptions h) = GhcOptions $ g ++ h  newtype GhcPkgOptions     -- | List of user-supplied ghc-pkg options.@@ -167,13 +167,13 @@  executeFallibly' :: String -> [String] -> IO (Maybe (String, String)) executeFallibly' cmd args = do-    x <- (executeFallibly (pipeoe intoLazyBytes intoLazyBytes) (proc cmd args))+    x <- (executeFallibly (piped (proc cmd args)) ((,) <$> (foldOut intoLazyBytes) <*> (foldErr intoLazyBytes)))          `catchIOError` -- FIXME Later, propagate the error so we can log it. Top level type should be an Either or something, not a Maybe.          (\e -> return $ Left $ show e)      return $ case x of         Left e              -> Nothing-        Right (_, (a, b))   -> Just $ (b2s a, b2s b)+        Right (a, b)   -> Just $ (b2s a, b2s b)    where @@ -184,7 +184,7 @@ getStackSnapshotPkgDb = do     putStrLn "getStackSnapshotPkgDb ..." -    x <- join <$> (fmap (fmap unwords . fmap words . Safe.headMay . lines) . fmap snd) <$> executeFallibly' "stack" ["path", "--snapshot-pkg-db"]+    x <- join <$> (fmap (fmap unwords . fmap words . Safe.headMay . lines) . fmap fst) <$> executeFallibly' "stack" ["path", "--snapshot-pkg-db"]      return $ case x of         Nothing     -> Nothing@@ -196,7 +196,7 @@ getStackLocalPkgDb = do     putStrLn "getStackLocalPkgDb ..." -    x <- join <$> (fmap (fmap unwords . fmap words . Safe.headMay . lines) . fmap snd) <$> executeFallibly' "stack" ["path", "--local-pkg-db"]+    x <- join <$> (fmap (fmap unwords . fmap words . Safe.headMay . lines) . fmap fst) <$> executeFallibly' "stack" ["path", "--local-pkg-db"]      return $ case x of         Nothing     -> Nothing

@@ -1,3 +1,8 @@+2016-04-04 v0.3.0.3++* Bugfix: was parsing stderr instead of stdout for some 'stack path' commands.+* Build against process-streaming-0.9.1.0 instead of process-streaming-0.7.2.2.+ 2016-03-30 v0.3.0.2  * Bugfix to the bugfix.

@@ -1,5 +1,5 @@ name:                ghc-imported-from-version:             0.3.0.2+version:             0.3.0.3 synopsis:            Find the Haddock documentation for a symbol. description:         Given a Haskell module and symbol, determine the URL to the Haddock documentation                      for that symbol.@@ -36,7 +36,7 @@                  , safe                  , bytestring                  , process-                 , process-streaming < 0.9.0.0+                 , process-streaming >= 0.9.0.0                  , directory                  , containers                  , mtl@@ -60,7 +60,7 @@   hs-source-dirs:   src   build-depends: base >=4.0 && <5                , process-               , process-streaming < 0.9.0.0+               , process-streaming >= 0.9.0.0   default-language:  Haskell2010  executable ghc-imported-from@@ -80,7 +80,7 @@                , safe                , bytestring                , process-               , process-streaming < 0.9.0.0+               , process-streaming >= 0.9.0.0                , directory                , containers                , mtl@@ -118,7 +118,7 @@                       , safe                       , bytestring                       , process-                      , process-streaming < 0.9.0.0+                      , process-streaming >= 0.9.0.0                       , directory                       , containers                       , mtl

@@ -3,7 +3,8 @@ - '.' extra-deps: - ghc-7.10.3-- conceit-0.3.2.0+- conceit-0.4.0.0 - pipes-text-0.0.1.0-- process-streaming-0.7.2.2+- process-streaming-0.9.1.0+- pipes-transduce-0.3.4.0 resolver: lts-5.10