cabal-install-parsers 0.4.2 → 0.4.3

raw patch · 3 files changed

+15/−5 lines, 3 filesdep ~Cabaldep ~aesonPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: Cabal, aeson

API changes (from Hackage documentation)

Files

Changelog.md +5/−0
cabal-install-parsers.cabal +2/−2
src/Cabal/Config.hs +8/−3

Changelog.md view

@@ -1,3 +1,8 @@+## 0.4.3++- Use `Cabal-3.6`+- `resolveConfig` respects `CABAL_DIR` environment variable+ ## 0.4.2  - `findConfig` respects `CABAL_DIR` environment variable

cabal-install-parsers.cabal view

@@ -1,6 +1,6 @@ cabal-version:      2.2 name:               cabal-install-parsers-version:            0.4.2+version:            0.4.3 synopsis:           Utilities to work with cabal-install files description:   @cabal-install-parsers@ provides parsers for @cabal-install@ files:@@ -57,7 +57,7 @@     , base          >=4.10     && <4.16     , binary        ^>=0.8.5     , bytestring    ^>=0.10.8.1-    , Cabal         ^>=3.4.0.0+    , Cabal         ^>=3.6.0.0     , containers    ^>=0.5.7.1 || ^>=0.6.0.1     , deepseq       ^>=1.4.2.0     , directory     ^>=1.3.0.0

src/Cabal/Config.hs view

@@ -74,10 +74,15 @@     case env of         Just p -> return p         Nothing -> do-            cabalDirVar <- lookupEnv "CABAL_DIR"-            cabalDir <- maybe (getAppUserDataDirectory "cabal") return cabalDirVar+            cabalDir <- findCabalDir             return (cabalDir </> "config") +-- | Find the @~\/.cabal@ dir.+findCabalDir :: IO FilePath+findCabalDir = do+    cabalDirVar <- lookupEnv "CABAL_DIR"+    maybe (getAppUserDataDirectory "cabal") return cabalDirVar+ ------------------------------------------------------------------------------- -- Config -------------------------------------------------------------------------------@@ -174,7 +179,7 @@ -- | Fill the default in @~\/.cabal\/config@  file. resolveConfig :: Config Maybe -> IO (Config Identity) resolveConfig cfg = do-    c <- getAppUserDataDirectory "cabal"+    c <- findCabalDir     return cfg         { cfgRemoteRepoCache = Identity $ fromMaybe (c </> "packages") (cfgRemoteRepoCache cfg)         , cfgInstallDir      = Identity $ fromMaybe (c </> "bin")      (cfgInstallDir cfg)