cabal-bounds 2.2.0 → 2.2.1

raw patch · 3 files changed

+13/−9 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG +4/−0
• cabal-bounds.cabal +1/−1
• lib/CabalBounds/Main.hs +8/−8

@@ -1,3 +1,7 @@+2.2.1+-----+* First consider the cabal new style directory 'dist-newstyle' and then the old one 'dist'+ 2.2.0 ------------ * Support Cabal 2.4 and ghc 8.6

@@ -1,6 +1,6 @@ cabal-version: >=1.9.2 name: cabal-bounds-version: 2.2.0+version: 2.2.1 license: BSD3 license-file: LICENSE maintainer: daniel.trstenjak@gmail.com

@@ -168,14 +168,14 @@    librariesFromPlanFile planFile  libraries "" "" Nothing Nothing cabalFile = do-   distDir <- liftIO $ CL.findDistDir cabalFile-   case distDir of-        Just distDir -> librariesFromSetupConfig $ distDir </> "setup-config"-        Nothing      -> do-           newDistDir <- liftIO $ CL.findNewDistDir cabalFile-           case newDistDir of-                Just newDistDir -> librariesFromPlanFile $ newDistDir </> "cache" </> "plan.json"-                Nothing         -> throwE "Couldn't find 'dist' nor 'dist-newstyle' directory! Have you already build the cabal project?"+   newDistDir <- liftIO $ CL.findNewDistDir cabalFile+   case newDistDir of+        Just newDistDir -> librariesFromPlanFile $ newDistDir </> "cache" </> "plan.json"+        Nothing         -> do+           distDir <- liftIO $ CL.findDistDir cabalFile+           case distDir of+                Just distDir -> librariesFromSetupConfig $ distDir </> "setup-config"+                Nothing      -> throwE "Couldn't find 'dist-newstyle' nor 'dist' directory! Have you already build the cabal project?"  libraries hpVersion libFile _ _ _ = do    hpLibs       <- haskellPlatformLibraries hpVersion