From 9d5ee06af81ddd5531b1b185b37a1bc8ff33f729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Gr=C3=B6ber?= Date: Fri, 6 Mar 2015 14:04:16 +0100 Subject: [PATCH] Fix GHC 7.10-rc1 --- CabalHelper/Main.hs | 4 ++++ .../pattern-synonyms/pattern-synonyms.cabal | 20 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CabalHelper/Main.hs b/CabalHelper/Main.hs index 8838f4d..1d22abb 100644 --- a/CabalHelper/Main.hs +++ b/CabalHelper/Main.hs @@ -58,6 +58,10 @@ import qualified Distribution.ModuleName as C (ModuleName) import Distribution.Text (display) import Distribution.Verbosity (Verbosity, silent, deafening) +#if CABAL_MAJOR == 1 && CABAL_MINOR >= 22 +import Distribution.Utils.NubList +#endif + import Control.Applicative ((<$>)) import Control.Monad import Control.Exception (catch, PatternMatchFail(..)) diff --git a/test/data/pattern-synonyms/pattern-synonyms.cabal b/test/data/pattern-synonyms/pattern-synonyms.cabal index a9b0489..06cf5fd 100644 --- a/test/data/pattern-synonyms/pattern-synonyms.cabal +++ b/test/data/pattern-synonyms/pattern-synonyms.cabal @@ -1,24 +1,24 @@ --- Initial pattern-synonyms.cabal generated by cabal init. For further +-- Initial pattern-synonyms.cabal generated by cabal init. For further -- documentation, see http://haskell.org/cabal/users-guide/ name: pattern-synonyms version: 0.1.0.0 --- synopsis: --- description: --- license: +-- synopsis: +-- description: +-- license: license-file: LICENSE author: Daniel Gröber maintainer: dxld@darkboxed.org --- copyright: --- category: +-- copyright: +-- category: build-type: Simple --- extra-source-files: +-- extra-source-files: cabal-version: >=1.10 library exposed-modules: A, B - -- other-modules: + -- other-modules: other-extensions: PatternSynonyms - build-depends: base >=4.7 && <4.8 - -- hs-source-dirs: + build-depends: base + -- hs-source-dirs: default-language: Haskell2010 \ No newline at end of file