diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-12-12 21:20:08 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2012-02-08 10:58:28 +0000 |
| commit | 2a58aa112a1e5736154fb3d93f65281405404a78 (patch) | |
| tree | c2c48a332ee1d18c66f1f2af1478474593dfc321 | |
| parent | 15cd666c82f5baaa941763a59f0a751c029273ba (diff) | |
| download | haskell-2a58aa112a1e5736154fb3d93f65281405404a78.tar.gz | |
MERGE from 7.4 branch: Update dependencies
| -rw-r--r-- | compiler/ghc.cabal.in | 6 | ||||
| -rw-r--r-- | ghc/ghc-bin.cabal.in | 4 | ||||
| -rw-r--r-- | utils/ghc-cabal/ghc-cabal.cabal | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 51ae1542e3..3bb2f5cfc4 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -62,7 +62,7 @@ Library Build-Depends: base < 3 if flag(stage1) && impl(ghc < 7.5) - Build-Depends: old-time >= 1 && < 1.1 + Build-Depends: old-time >= 1 && < 1.2 if flag(base3) || flag(base4) Build-Depends: directory >= 1 && < 1.2, @@ -70,9 +70,9 @@ Library bytestring >= 0.9 && < 0.10, time < 1.5, containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4 + array >= 0.1 && < 0.5 - Build-Depends: filepath >= 1 && < 1.3 + Build-Depends: filepath >= 1 && < 1.4 Build-Depends: Cabal, hpc if os(windows) Build-Depends: Win32 diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in index ba17150e9a..0cf51d05e1 100644 --- a/ghc/ghc-bin.cabal.in +++ b/ghc/ghc-bin.cabal.in @@ -26,11 +26,11 @@ Flag ghci Executable ghc Main-Is: Main.hs Build-Depends: base >= 3 && < 5, - array >= 0.1 && < 0.4, + array >= 0.1 && < 0.5, bytestring >= 0.9 && < 0.10, directory >= 1 && < 1.2, process >= 1 && < 1.2, - filepath >= 1 && < 1.3, + filepath >= 1 && < 1.4, ghc if os(windows) Build-Depends: Win32 diff --git a/utils/ghc-cabal/ghc-cabal.cabal b/utils/ghc-cabal/ghc-cabal.cabal index 0c45b8357a..7bbab037e4 100644 --- a/utils/ghc-cabal/ghc-cabal.cabal +++ b/utils/ghc-cabal/ghc-cabal.cabal @@ -18,5 +18,5 @@ Executable ghc-cabal Build-Depends: base >= 3 && < 5, Cabal >= 1.10 && < 1.16, directory >= 1.1 && < 1.2, - filepath >= 1.2 && < 1.3 + filepath >= 1.2 && < 1.4 |