Repository : ssh://g...@git.haskell.org/Cabal
On branch : ghc-head
Link :
http://git.haskell.org/packages/Cabal.git/commitdiff/1b57d192f16c3d9a335ef09cab409a117d440da6
>---------------------------------------------------------------
commit 1b57d192f16c3d9a335ef09cab409a117d440da6
Author: Mikhail Glushenkov <mikhail.glushen...@gmail.com>
Date: Tue Sep 10 22:00:31 2013 +0200
process < 1.1.0.2 requires directory < 1.2.
Fixes #1498.
(cherry picked from commit f024ce631a28c5ce25e8c73cfd2f84e4020af1a6)
>---------------------------------------------------------------
1b57d192f16c3d9a335ef09cab409a117d440da6
cabal-install/cabal-install.cabal | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cabal-install/cabal-install.cabal
b/cabal-install/cabal-install.cabal
index 98ce7c4..6f5f82b 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -125,16 +125,17 @@ executable cabal
mtl >= 2.0 && < 3,
network >= 1 && < 3,
pretty >= 1 && < 1.2,
- process >= 1.0.1.1 && < 1.3,
random >= 1 && < 1.1,
stm >= 2.0 && < 3,
time >= 1.1 && < 1.5,
zlib >= 0.5.3 && < 0.6
if flag(old-directory)
- build-depends: directory >= 1 && < 1.2, old-time >= 1 && < 1.2
+ build-depends: directory >= 1 && < 1.2, old-time >= 1 && < 1.2,
+ process >= 1.0.1.1 && < 1.1.0.2
else
- build-depends: directory >= 1.2 && < 1.3
+ build-depends: directory >= 1.2 && < 1.3,
+ process >= 1.1.0.2 && < 1.3
if os(windows)
build-depends: Win32 >= 2 && < 3
_______________________________________________
ghc-commits mailing list
ghc-commits@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-commits
