aboutsummaryrefslogtreecommitdiff
path: root/CabalHelper
diff options
context:
space:
mode:
Diffstat (limited to 'CabalHelper')
-rw-r--r--CabalHelper/Licenses.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/CabalHelper/Licenses.hs b/CabalHelper/Licenses.hs
index d1258c7..eeebae7 100644
--- a/CabalHelper/Licenses.hs
+++ b/CabalHelper/Licenses.hs
@@ -17,7 +17,6 @@ import System.FilePath (takeExtension)
import System.IO (hPutStrLn, stderr)
import Distribution.InstalledPackageInfo
-import Distribution.InstalledPackageInfo
import Distribution.License
import Distribution.Package
import Distribution.Simple.Configure
@@ -37,10 +36,10 @@ type CPackageIndex a = PackageIndex
#if CABAL_MAJOR == 1 && CABAL_MINOR > 22
type CInstalledPackageId = ComponentId
lookupInstalledPackageId = lookupComponentId
+#else
+type CInstalledPackageId = InstalledPackageId
#endif
-
-
findTransitiveDependencies
:: CPackageIndex a
-> Set CInstalledPackageId
@@ -58,7 +57,7 @@ findTransitiveDependencies pkgIdx set0 = go Set.empty (Set.toList set0)
-- We can ignore those.
go set queue
Just ipi ->
- go (Set.insert q set) (depends ipi ++ queue)
+ go (Set.insert q set) (Distribution.InstalledPackageInfo.depends ipi ++ queue)
--------------------------------------------------------------------------------