Merge branch 'master' of https://github.com/robeverest/ghc-mod

Conflicts: Language/Haskell/GhcMod/CabalConfig.hs
2014-09-12 05:21:12 +02:00
parent 8b01af6cde 2c2e7782d2
commit 690a64f5b5
9 changed files with 66 additions and 16 deletions
--- a/test/data/cabal-flags/cabal-flags.cabal
+++ b/test/data/cabal-flags/cabal-flags.cabal
@@ -0,0 +1,14 @@
+name: cabal-flags
+version: 0.1.0
+build-type: Simple
+cabal-version: >= 1.8
+
+flag test-flag
+  default: False
+
+library
+  build-depends: base == 4.*
+
+  if flag(test-flag)
+    build-depends: Cabal >= 1.10
+