diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2014-05-14 12:33:31 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2014-05-15 10:18:02 +0200 |
| commit | 61fdafcf96c2586710c9bbb0a0db2f21e348fc1e (patch) | |
| tree | d0aa94a6a6380b235139ee2e2d60a28d3ffe27a2 | |
| parent | 913b3146541e203b2524e756b047b7f90be849b7 (diff) | |
| download | haskell-61fdafcf96c2586710c9bbb0a0db2f21e348fc1e.tar.gz | |
Drop use of CPP in `bin-package-db`
This also removes the redundant `default-extensions` field in
`bin-package-db.cabal` and adds an `other-extensions` field instead.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
| -rw-r--r-- | libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs | 7 | ||||
| -rw-r--r-- | libraries/bin-package-db/bin-package-db.cabal | 7 |
2 files changed, 9 insertions, 5 deletions
diff --git a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs index ab7fcf5652..6ad169787f 100644 --- a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs +++ b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs @@ -1,11 +1,10 @@ -{-# LANGUAGE CPP, RecordWildCards, TypeSynonymInstances, StandaloneDeriving, GeneralizedNewtypeDeriving #-} +{-# LANGUAGE RecordWildCards, Trustworthy, TypeSynonymInstances, StandaloneDeriving, + GeneralizedNewtypeDeriving #-} {-# OPTIONS_GHC -fno-warn-name-shadowing #-} -- This module deliberately defines orphan instances for now. Should -- become unnecessary once we move to using the binary package properly: {-# OPTIONS_GHC -fno-warn-orphans #-} -#if __GLASGOW_HASKELL__ >= 701 -{-# LANGUAGE Trustworthy #-} -#endif + ----------------------------------------------------------------------------- -- | -- Module : Distribution.InstalledPackageInfo.Binary diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal index 699a1dde71..dd84f9ca4b 100644 --- a/libraries/bin-package-db/bin-package-db.cabal +++ b/libraries/bin-package-db/bin-package-db.cabal @@ -14,6 +14,12 @@ source-repository head Library default-language: Haskell2010 + other-extensions: + GeneralizedNewtypeDeriving + RecordWildCards + StandaloneDeriving + Trustworthy + TypeSynonymInstances exposed-modules: Distribution.InstalledPackageInfo.Binary @@ -22,4 +28,3 @@ Library binary >= 0.5 && < 0.8, Cabal >= 1.20 && < 1.21 - default-extensions: CPP |