Commit 5582bc8e authored by Ben Millwood's avatar Ben Millwood
Browse files

Remove redundant flags and deps from cabal file

cabal-install no longer builds with GHC 6.8 or base < 4, so we don't
need to test for those configurations.
parent 7f7d25ee
......@@ -30,18 +30,10 @@ source-repository head
location: https://github.com/haskell/cabal/
subdir: cabal-install
flag old-base
description: Old, monolithic base
default: False
flag bytestring-in-base
Library
ghc-options: -Wall
ghc-options: -Wall -fwarn-tabs
if arch(arm)
cc-options: -DCABAL_NO_THREADED
if impl(ghc >= 6.8)
ghc-options: -fwarn-tabs
Exposed-Modules:
Distribution.Client.BuildReports.Anonymous
Distribution.Client.BuildReports.Storage
......@@ -116,7 +108,7 @@ Library
Other-Modules:
Paths_cabal_install
build-depends: base >= 2 && < 5,
build-depends: base >= 4 && < 5,
Cabal >= 1.17.0 && < 1.18,
filepath >= 1.0 && < 1.4,
network >= 1 && < 3,
......@@ -124,12 +116,8 @@ Library
zlib >= 0.5.3 && < 0.6,
time >= 1.1 && < 1.5,
mtl >= 2.0 && < 3,
stm >= 2.0 && < 3
if flag(old-base)
build-depends: base < 3
else
build-depends: base >= 3,
stm >= 2.0 && < 3,
bytestring >= 0.9 && < 1,
process >= 1 && < 1.3,
directory >= 1 && < 1.3,
pretty >= 1 && < 1.2,
......@@ -138,10 +126,6 @@ Library
array >= 0.1 && < 0.5,
old-time >= 1 && < 1.2
if flag(bytestring-in-base)
build-depends: base >= 2.0 && < 2.2
else
build-depends: base < 2.0 || >= 3.0, bytestring >= 0.9
if os(windows)
build-depends: Win32 >= 2 && < 3
......@@ -153,20 +137,14 @@ Library
Executable cabal
Main-Is: Main.hs
hs-source-dirs: src
ghc-options: -Wall
ghc-options: -Wall -fwarn-tabs
if !arch(arm)
ghc-options: -threaded
if impl(ghc >= 6.8)
ghc-options: -fwarn-tabs
build-depends: base >= 2 && < 5,
build-depends: base >= 4 && < 5,
Cabal >= 1.17.0 && < 1.18,
cabal-install >= 1.17.0 && < 1.18,
directory >= 1 && < 1.3,
filepath >= 1.0 && < 1.4
if flag(old-base)
build-depends: base < 3
else
build-depends: base >= 3,
directory >= 1 && < 1.3
Test-Suite unit-tests
type: exitcode-stdio-1.0
......@@ -182,8 +160,6 @@ Test-Suite unit-tests
QuickCheck (>= 2.5),
cabal-install,
Cabal
ghc-options: -Wall
ghc-options: -Wall -fwarn-tabs
if !arch(arm)
ghc-options: -threaded
if impl(ghc >= 6.8)
ghc-options: -fwarn-tabs
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment