shake-cabal 0.1.0.4 → 0.1.0.5
raw patch · 3 files changed
+13/−5 lines, 3 filesdep +filepathPVP ok
version bump matches the API change (PVP)
Dependencies added: filepath
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- shake-cabal.cabal +5/−3
- src/Development/Shake/Cabal.hs +3/−2
+ CHANGELOG.md view
@@ -0,0 +1,5 @@+# shake-cabal++## 0.1.0.5++ * Slightly better behavior for `getCabalDepsA` and `getCabalDepsV`
shake-cabal.cabal view
@@ -1,18 +1,19 @@ cabal-version: 1.18 name: shake-cabal-version: 0.1.0.4+version: 0.1.0.5 license: BSD3 license-file: LICENSE copyright: Copyright: (c) 2018 Vanessa McHale maintainer: vanessa.mchale@iohk.io author: Vanessa McHale-bug-reports: https://github.com/vmchale/atspkg/issues+bug-reports: https://hub.darcs.net/vmchale/ats/issues synopsis: Shake library for use with cabal description: A library for using [shake](http://hackage.haskell.org/package/shake) alongside [cabal](https://www.haskell.org/cabal/). category: Development build-type: Simple extra-doc-files: README.md+ CHANGELOG.md source-repository head type: darcs@@ -35,7 +36,8 @@ shake >=0.14, Cabal >=2.2, directory -any,- composition-prelude -any+ composition-prelude -any,+ filepath -any if flag(development) ghc-options: -Werror
src/Development/Shake/Cabal.hs view
@@ -29,6 +29,7 @@ import Distribution.Verbosity as Distribution import Distribution.Version import System.Directory (doesFileExist)+import System.FilePath (pathSeparator) import System.Info (arch, os) data HsCompiler = GHC { _suff :: Maybe String -- ^ Compiler version@@ -119,7 +120,7 @@ benchSrc = extractHelper benchToFiles benches foreignSrc = extractHelper foreignToFiles foreigns - dirHelper f xs = (fmap (++ "/") . hsSourceDirs . f <=< extract) =<< xs+ dirHelper f xs = (fmap (++ [pathSeparator]) . hsSourceDirs . f <=< extract) =<< xs dir = dirHelper libBuildInfo libs exeDir = dirHelper buildInfo exes@@ -146,4 +147,4 @@ benchFiles <- h (dirgeBench benchSrc) foreignFiles <- h (dirgeForeign foreignSrc) - pure (vers, extraSrc ++ norms ++ exeFiles ++ subFiles ++ testFiles ++ benchFiles ++ foreignFiles)+ pure (vers, p : extraSrc ++ norms ++ exeFiles ++ subFiles ++ testFiles ++ benchFiles ++ foreignFiles)