diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-03-18 12:33:10 +0000 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-18 12:33:10 +0000 |
| commit | 0faa8f539f94f51002c73fb1b9c8b22a6d6321e2 (patch) | |
| tree | 0b05b26ddf455a008e413b433c1fdb2a4c63f5ff /libraries/bin-package-db | |
| parent | 01efdd6c4b066fbfdf17c6d2b1cad0fd651d334a (diff) | |
| download | haskell-0faa8f539f94f51002c73fb1b9c8b22a6d6321e2.tar.gz | |
Remove base 3 support from bin-package-db
Diffstat (limited to 'libraries/bin-package-db')
| -rw-r--r-- | libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs | 6 | ||||
| -rw-r--r-- | libraries/bin-package-db/bin-package-db.cabal | 9 |
2 files changed, 1 insertions, 14 deletions
diff --git a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs index f6cbc7cfae..476897ef30 100644 --- a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs +++ b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs @@ -36,13 +36,7 @@ readBinPackageDB file (\err -> error ("While parsing " ++ show file ++ ": " ++ err)) catchUserError :: IO a -> (String -> IO a) -> IO a -#ifdef BASE3 -catchUserError io f = io `Exception.catch` \e -> case e of - ErrorCall err -> f err - _ -> throw e -#else catchUserError io f = io `Exception.catch` \(ErrorCall err) -> f err -#endif writeBinPackageDB :: Binary m => FilePath -> [InstalledPackageInfo_ m] -> IO () writeBinPackageDB file ipis = Bin.encodeFile file ipis diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal index 7fde05d1aa..67c7f658db 100644 --- a/libraries/bin-package-db/bin-package-db.cabal +++ b/libraries/bin-package-db/bin-package-db.cabal @@ -11,18 +11,11 @@ source-repository head type: darcs location: http://darcs.haskell.org/ghc -flag base3 - default: False - Library { exposed-modules: Distribution.InstalledPackageInfo.Binary - if flag(base3) - build-depends: base >= 3 && < 4 - cpp-options: -DBASE3 - else - build-depends: base >= 4 && < 5 + build-depends: base >= 4 && < 5 build-depends: binary >= 0.5 && < 0.8, Cabal >= 1.8 && < 1.18 |