From 07b4bbba1c312c385504b3def93607def2d5e4db Mon Sep 17 00:00:00 2001 From: Alan Zimmerman Date: Mon, 27 Nov 2017 23:27:54 +0200 Subject: WIP on getting projects to build with Cabal 2.0/GHC 8.2 --- cabal-helper.cabal | 74 +++++++++++++++++++++++++++--------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) (limited to 'cabal-helper.cabal') diff --git a/cabal-helper.cabal b/cabal-helper.cabal index 80002b3..468d10b 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -125,44 +125,44 @@ executable cabal-helper-wrapper , utf8-string < 1.1 && >= 1.0.1.1 , ghc-prim -test-suite compile-test - default-language: Haskell2010 - default-extensions: NondecreasingIndentation - type: exitcode-stdio-1.0 - main-is: CompileTest.hs - hs-source-dirs: tests, src - other-modules: - CabalHelper.Compiletime.Compat.Environment - CabalHelper.Compiletime.Compat.Version - CabalHelper.Compiletime.Compile - CabalHelper.Compiletime.Data - CabalHelper.Compiletime.Log - CabalHelper.Compiletime.Types - CabalHelper.Shared.Common - CabalHelper.Shared.Sandbox - Paths_cabal_helper - ghc-options: -Wall - build-tools: cabal +-- test-suite compile-test +-- default-language: Haskell2010 +-- default-extensions: NondecreasingIndentation +-- type: exitcode-stdio-1.0 +-- main-is: CompileTest.hs +-- hs-source-dirs: tests, src +-- other-modules: +-- CabalHelper.Compiletime.Compat.Environment +-- CabalHelper.Compiletime.Compat.Version +-- CabalHelper.Compiletime.Compile +-- CabalHelper.Compiletime.Data +-- CabalHelper.Compiletime.Log +-- CabalHelper.Compiletime.Types +-- CabalHelper.Shared.Common +-- CabalHelper.Shared.Sandbox +-- Paths_cabal_helper +-- ghc-options: -Wall +-- build-tools: cabal - -- Same as cabal-helper-wrapper - build-depends: base < 5 && >= 4.5 - if os(windows) - build-depends: base >= 4.7 - build-depends: Cabal < 2.1 && >= 2.0 || < 1.26 && >= 1.14 - , bytestring < 0.11 && >= 0.9.2.1 - , directory < 1.4 && >= 1.1.0.2 - , exceptions < 0.9 && >= 0.8.3 - , filepath < 1.5 && >= 1.3.0.0 - , mtl < 2.3 && >= 2.0 - , process < 1.7 && >= 1.1.0.1 - , template-haskell < 2.13 && >= 2.7.0.0 - , temporary < 1.3 && >= 1.2.0.4 - , transformers < 0.6 && >= 0.3.0.0 - if !os(windows) - build-depends: unix < 2.8 && >= 2.5.1.1 - build-depends: unix-compat < 0.5 && >= 0.4.3.1 - , utf8-string < 1.1 && >= 1.0.1.1 - , ghc-prim +-- -- Same as cabal-helper-wrapper +-- build-depends: base < 5 && >= 4.5 +-- if os(windows) +-- build-depends: base >= 4.7 +-- build-depends: Cabal < 2.1 && >= 2.0 || < 1.26 && >= 1.14 +-- , bytestring < 0.11 && >= 0.9.2.1 +-- , directory < 1.4 && >= 1.1.0.2 +-- , exceptions < 0.9 && >= 0.8.3 +-- , filepath < 1.5 && >= 1.3.0.0 +-- , mtl < 2.3 && >= 2.0 +-- , process < 1.7 && >= 1.1.0.1 +-- , template-haskell < 2.13 && >= 2.7.0.0 +-- , temporary < 1.3 && >= 1.2.0.4 +-- , transformers < 0.6 && >= 0.3.0.0 +-- if !os(windows) +-- build-depends: unix < 2.8 && >= 2.5.1.1 +-- build-depends: unix-compat < 0.5 && >= 0.4.3.1 +-- , utf8-string < 1.1 && >= 1.0.1.1 +-- , ghc-prim test-suite ghc-session default-language: Haskell2010 -- cgit v1.2.3