From 7fc3b9d468a4a2997a7fed63e378567f2ef3a401 Mon Sep 17 00:00:00 2001 From: Daniel Gröber Date: Tue, 24 Apr 2018 00:31:17 +0200 Subject: Drop Cabal<2.0 compiletime support We still support <2.0 at runtime this only concerns the Cabal version used at cabal-install time. --- cabal-helper.cabal | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'cabal-helper.cabal') diff --git a/cabal-helper.cabal b/cabal-helper.cabal index a54d61f..13b6cd9 100644 --- a/cabal-helper.cabal +++ b/cabal-helper.cabal @@ -30,8 +30,8 @@ license-files: LICENSE author: Daniel Gröber maintainer: dxld@darkboxed.org category: Distribution -build-type: Custom -cabal-version: >=1.14 +build-type: Simple +cabal-version: 2.0 extra-source-files: README.md src/CabalHelper/Runtime/*.hs @@ -62,12 +62,6 @@ source-repository head type: git location: https://github.com/DanielG/cabal-helper.git -custom-setup - setup-depends: base - , Cabal < 2.3 && >= 2.0 || < 1.25 && >= 1.14 - , filepath < 1.5 - , directory < 1.4 - flag dev description: Build development components default: False @@ -86,6 +80,8 @@ flag dev -- -- Instantiate common some-name -- -- $ gawk -i inplace -f scripts/update-cabal-common-section-instantiations.awk cabal-helper.cabal +-- +-- FIXME: We can use Cabal 2.0 features now, yey! library default-language: Haskell2010 @@ -96,6 +92,8 @@ library CabalHelper.Shared.InterfaceTypes CabalHelper.Shared.Sandbox Paths_cabal_helper + autogen-modules: Paths_cabal_helper + ghc-options: -Wall build-depends: base < 5 && >= 4.5 @@ -122,7 +120,6 @@ executable cabal-helper-wrapper if flag(dev) ghc-options: -Wall scope: private - x-scope: private -- Common c-h-wrapper-fields -- See [Note test dependencies] default-language: Haskell2010 -- cgit v1.2.3