diff options
| author | Daniel Gröber <dxld@darkboxed.org> | 2015-03-12 13:58:45 +0100 |
|---|---|---|
| committer | Daniel Gröber <dxld@darkboxed.org> | 2015-03-12 13:58:45 +0100 |
| commit | 3db768d6bd5e720c9e1186415dbc36d8cd8caade (patch) | |
| tree | 7b7b260c2e89698c3e978915ebcbee5d54c32308 | |
| parent | a01716bc76b6a23cb89d27959f70b88a62e45fb9 (diff) | |
Use `-package-conf` to be backwards compatible
| -rw-r--r-- | CabalHelper/Wrapper.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CabalHelper/Wrapper.hs b/CabalHelper/Wrapper.hs index 6ba933d..933cb2f 100644 --- a/CabalHelper/Wrapper.hs +++ b/CabalHelper/Wrapper.hs @@ -236,7 +236,7 @@ compile Options {..} Compile {..} = do , "-optP-DCABAL_MAJOR=" ++ show mj , "-optP-DCABAL_MINOR=" ++ show mi ], - maybeToList $ ("-package-db="++) <$> packageDb, + maybeToList $ ("-package-conf="++) <$> packageDb, map ("-i"++) $ cabalHelperSourceDir:maybeToList cabalSourceDir, concatMap (\p -> ["-package", p]) packageDeps, [ "--make", cabalHelperSourceDir </> "CabalHelper/Main.hs" ] @@ -353,7 +353,7 @@ listCabalVersions opts = listCabalVersions' opts Nothing -- TODO: Include sandbox? Probably only relevant for build-type:custom projects. listCabalVersions' :: Options -> Maybe FilePath -> IO [Version] listCabalVersions' Options {..} mdb = do - let mdbopt = ("--package-db="++) <$> mdb + let mdbopt = ("--package-conf="++) <$> mdb opts = ["list", "--simple-output", "Cabal"] ++ maybeToList mdbopt catMaybes . map (fmap snd . parsePkgId . fromString) . words |