summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/ghc.cabal.in10
-rw-r--r--ghc/ghc-bin.cabal.in9
-rw-r--r--libraries/bin-package-db/bin-package-db.cabal16
-rw-r--r--libraries/integer-simple/integer-simple.cabal12
-rw-r--r--utils/compare_sizes/compareSizes.cabal4
-rw-r--r--utils/dll-split/dll-split.cabal3
-rw-r--r--utils/ghc-cabal/ghc-cabal.cabal3
-rw-r--r--utils/ghc-pkg/ghc-pkg.cabal5
-rw-r--r--utils/ghc-pwd/ghc-pwd.cabal3
-rw-r--r--utils/ghctags/ghctags.cabal4
-rw-r--r--utils/hpc/hpc-bin.cabal5
-rw-r--r--utils/mkUserGuidePart/mkUserGuidePart.cabal3
-rw-r--r--utils/runghc/runghc.cabal.in3
13 files changed, 45 insertions, 35 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 1b160aced7..9dc7826e25 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -18,7 +18,7 @@ Description:
through this package.
Category: Development
Build-Type: Simple
-Cabal-Version: >= 1.2.3
+Cabal-Version: >=1.10
Flag ghci
Description: Build GHCi support.
@@ -41,6 +41,7 @@ Flag stage3
Manual: True
Library
+ Default-Language: Haskell2010
Exposed: False
Build-Depends: base >= 4 && < 5,
@@ -73,13 +74,10 @@ Library
Build-Depends: bin-package-db
Build-Depends: hoopl
- Extensions: CPP, MagicHash, UnboxedTuples, PatternGuards,
- ForeignFunctionInterface, EmptyDataDecls,
+ Default-Extensions: CPP, MagicHash, UnboxedTuples
TypeSynonymInstances, MultiParamTypeClasses,
FlexibleInstances, RankNTypes, ScopedTypeVariables,
- DeriveDataTypeable, BangPatterns
- if impl(ghc >= 7.1)
- Extensions: NondecreasingIndentation
+ DeriveDataTypeable, BangPatterns, NondecreasingIndentation
Include-Dirs: . parser utils
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 68338f37f7..5b40e259d2 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -16,7 +16,7 @@ Category: XXX
Data-Dir: ..
Data-Files: settings
Build-Type: Simple
-Cabal-Version: >= 1.2
+Cabal-Version: >=1.10
Flag ghci
Description: Build GHCi support.
@@ -24,6 +24,8 @@ Flag ghci
Manual: True
Executable ghc
+ Default-Language: Haskell2010
+
Main-Is: Main.hs
Build-Depends: base >= 3 && < 5,
array >= 0.1 && < 0.6,
@@ -45,10 +47,9 @@ Executable ghc
GHC-Options: -fno-warn-name-shadowing
Other-Modules: InteractiveUI, GhciMonad, GhciTags
Build-Depends: transformers, haskeline
- Extensions: ForeignFunctionInterface,
- UnboxedTuples,
+ Default-Extensions: UnboxedTuples,
FlexibleInstances,
TupleSections,
MagicHash
- Extensions: CPP, PatternGuards, NondecreasingIndentation
+ Default-Extensions: CPP, NondecreasingIndentation
diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal
index 44408a77b6..699a1dde71 100644
--- a/libraries/bin-package-db/bin-package-db.cabal
+++ b/libraries/bin-package-db/bin-package-db.cabal
@@ -4,22 +4,22 @@ license: BSD3
maintainer: ghc-devs@haskell.org
bug-reports: glasgow-haskell-bugs@haskell.org
synopsis: A binary format for the package database
-cabal-version: >=1.6
-build-type: Simple
+cabal-version: >=1.10
+build-type: Simple
source-repository head
type: git
location: http://git.haskell.org/ghc.git
subdir: libraries/bin-package-db
-Library {
+Library
+ default-language: Haskell2010
+
exposed-modules:
Distribution.InstalledPackageInfo.Binary
- build-depends: base >= 4 && < 5
-
- build-depends: binary >= 0.5 && < 0.8,
+ build-depends: base >= 4 && < 5,
+ binary >= 0.5 && < 0.8,
Cabal >= 1.20 && < 1.21
- extensions: CPP
-}
+ default-extensions: CPP
diff --git a/libraries/integer-simple/integer-simple.cabal b/libraries/integer-simple/integer-simple.cabal
index fa41c240c4..51d3cc7b5b 100644
--- a/libraries/integer-simple/integer-simple.cabal
+++ b/libraries/integer-simple/integer-simple.cabal
@@ -7,7 +7,7 @@ maintainer: igloo@earth.li
synopsis: Simple Integer library
description:
This package contains an simple Integer library.
-cabal-version: >=1.6
+cabal-version: >=1.10
build-type: Simple
source-repository head
@@ -15,17 +15,17 @@ source-repository head
location: http://git.haskell.org/ghc.git
subdir: libraries/integer-simple
-Library {
+Library
+ default-language: Haskell2010
+
build-depends: ghc-prim
exposed-modules: GHC.Integer
GHC.Integer.Simple.Internals
GHC.Integer.Logarithms
GHC.Integer.Logarithms.Internals
other-modules: GHC.Integer.Type
- extensions: CPP, MagicHash, BangPatterns, UnboxedTuples,
- ForeignFunctionInterface, UnliftedFFITypes,
- NoImplicitPrelude
+ default-extensions: CPP, MagicHash, BangPatterns, UnboxedTuples,
+ UnliftedFFITypes, NoImplicitPrelude
-- We need to set the package name to integer-simple
-- (without a version number) as it's magic.
ghc-options: -package-name integer-simple -Wall
-}
diff --git a/utils/compare_sizes/compareSizes.cabal b/utils/compare_sizes/compareSizes.cabal
index 32acb1d6e7..f8f42636a7 100644
--- a/utils/compare_sizes/compareSizes.cabal
+++ b/utils/compare_sizes/compareSizes.cabal
@@ -1,6 +1,6 @@
name: compareSizes
version: 0.1.0.0
-cabal-version: >= 1.6
+cabal-version: >=1.10
license: BSD3
build-type: Simple
license-file: LICENSE
@@ -10,6 +10,8 @@ description: Size comparison util
category: Development
executable compareSizes
+ default-language: Haskell2010
+
build-depends:
base >= 4 && < 5,
directory,
diff --git a/utils/dll-split/dll-split.cabal b/utils/dll-split/dll-split.cabal
index bece0a4770..290af06472 100644
--- a/utils/dll-split/dll-split.cabal
+++ b/utils/dll-split/dll-split.cabal
@@ -10,9 +10,10 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Executable dll-split
+ Default-Language: Haskell2010
Main-Is: Main.hs
Build-Depends: base >= 4 && < 5,
diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal
index 74399ce390..0f13b9dcf4 100644
--- a/utils/ghc-cabal/ghc-cabal.cabal
+++ b/utils/ghc-cabal/ghc-cabal.cabal
@@ -10,9 +10,10 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Executable ghc-cabal
+ Default-Language: Haskell2010
Main-Is: ghc-cabal.hs
Build-Depends: base >= 3 && < 5,
diff --git a/utils/ghc-pkg/ghc-pkg.cabal b/utils/ghc-pkg/ghc-pkg.cabal
index 2f42e31f15..265721d97a 100644
--- a/utils/ghc-pkg/ghc-pkg.cabal
+++ b/utils/ghc-pkg/ghc-pkg.cabal
@@ -11,12 +11,13 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.4
+cabal-version: >=1.10
Executable ghc-pkg
+ Default-Language: Haskell2010
Main-Is: Main.hs
Other-Modules: Version
- Extensions: CPP, ForeignFunctionInterface, NondecreasingIndentation
+ Default-Extensions: CPP, NondecreasingIndentation
Build-Depends: base >= 4 && < 5,
directory >= 1 && < 1.3,
diff --git a/utils/ghc-pwd/ghc-pwd.cabal b/utils/ghc-pwd/ghc-pwd.cabal
index ba2eb63b82..4d155b0317 100644
--- a/utils/ghc-pwd/ghc-pwd.cabal
+++ b/utils/ghc-pwd/ghc-pwd.cabal
@@ -9,9 +9,10 @@ Synopsis: XXX
Description:
XXX
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Executable ghc-pwd
+ Default-Language: Haskell2010
Main-Is: ghc-pwd.hs
Build-Depends: base >= 3 && < 5,
directory >= 1 && < 1.3
diff --git a/utils/ghctags/ghctags.cabal b/utils/ghctags/ghctags.cabal
index 0e97ccade6..31e80b289b 100644
--- a/utils/ghctags/ghctags.cabal
+++ b/utils/ghctags/ghctags.cabal
@@ -10,9 +10,11 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Executable ghctags
+ Default-Language: Haskell2010
+
Main-Is: Main.hs
Build-Depends: base >= 4 && < 5,
diff --git a/utils/hpc/hpc-bin.cabal b/utils/hpc/hpc-bin.cabal
index 4f94ab0fa0..6d15e8b067 100644
--- a/utils/hpc/hpc-bin.cabal
+++ b/utils/hpc/hpc-bin.cabal
@@ -11,7 +11,7 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Flag base4
Description: Choose the even newer, even smaller, split-up base package.
@@ -20,6 +20,7 @@ Flag base3
Description: Choose the new smaller, split-up base package.
Executable hpc
+ Default-Language: Haskell2010
Main-Is: Hpc.hs
Other-Modules: HpcParser
HpcCombine
@@ -45,5 +46,5 @@ Executable hpc
containers >= 0.1 && < 0.6,
array >= 0.1 && < 0.6
Build-Depends: hpc
- Extensions: CPP
+ Default-Extensions: CPP
diff --git a/utils/mkUserGuidePart/mkUserGuidePart.cabal b/utils/mkUserGuidePart/mkUserGuidePart.cabal
index 3cadaacd47..112bbf6a81 100644
--- a/utils/mkUserGuidePart/mkUserGuidePart.cabal
+++ b/utils/mkUserGuidePart/mkUserGuidePart.cabal
@@ -9,9 +9,10 @@ Synopsis: XXX
Description:
XXX
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Executable mkUserGuidePart
+ Default-Language: Haskell2010
Main-Is: Main.hs
Build-Depends: base >= 3 && < 5,
ghc
diff --git a/utils/runghc/runghc.cabal.in b/utils/runghc/runghc.cabal.in
index f9cbacca54..fde6b9a4d6 100644
--- a/utils/runghc/runghc.cabal.in
+++ b/utils/runghc/runghc.cabal.in
@@ -10,12 +10,13 @@ Description:
XXX
Category: Development
build-type: Simple
-cabal-version: >=1.2
+cabal-version: >=1.10
Flag base3
Description: Choose the new smaller, split-up base package.
Executable runghc
+ Default-Language: Haskell2010
Main-Is: runghc.hs
if flag(base3)
View Lorry Controller Status