hunk ./plugins.cabal 2 -version: 1.5.1.2 +version: 1.5.1.3 hunk ./src/System/Plugins/Env.hs 61 -import Data.List ( nub ) +import Data.List ( (\\), nub, ) +import qualified Data.List as List hunk ./src/System/Plugins/Env.hs 303 - -- we add each package with and without it's version number - addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p) + -- we add each package with and without it's version number and with the full installedPackageId + addOnePkg p fm' = addToPkgEnvs (addToPkgEnvs (addToPkgEnvs fm' (display $ sourcePackageId p) p) (display $ installedPackageId p) p) hunk ./src/System/Plugins/Env.hs 365 -lookupPkg p = do +lookupPkg pn = go [] pn + where + go :: [PackageName] -> PackageName -> IO ([FilePath],[FilePath]) + go seen p = do hunk ./src/System/Plugins/Env.hs 371 - (f', g') <- liftM unzip $ mapM lookupPkg ps + (f', g') <- liftM unzip $ mapM (go (nub $ seen ++ ps)) (ps \\ seen) hunk ./plugins.cabal 2 -version: 1.5.1.3 +version: 1.5.1.4 hunk ./plugins.cabal 11 + hunk ./plugins.cabal 13 + hunk ./src/System/Plugins/Env.hs 62 -import qualified Data.List as List