Commit fe1fce87 authored by eir@cis.upenn.edu's avatar eir@cis.upenn.edu
Browse files

Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc

parents 959d5a9f cfb96960
......@@ -50,7 +50,7 @@ Library
Build-Depends: base >= 4 && < 5,
directory >= 1 && < 1.3,
process >= 1 && < 1.2,
process >= 1 && < 1.3,
bytestring >= 0.9 && < 0.11,
time < 1.5,
containers >= 0.1 && < 0.6,
......
......@@ -29,7 +29,7 @@ Executable ghc
array >= 0.1 && < 0.5,
bytestring >= 0.9 && < 0.11,
directory >= 1 && < 1.3,
process >= 1 && < 1.2,
process >= 1 && < 1.3,
filepath >= 1 && < 1.4,
ghc
if os(windows)
......
Cabal @ 4b43bd95
Subproject commit 532e349ec6ee33fc3477137b44f108d3658d0528
Subproject commit 4b43bd95753e5f3e29d7bfbe6bba8477715ac296
haskeline @ 80335c06
Subproject commit 9ad00926f832f4e5f5d38c8fe84bfc85f4e8f728
Subproject commit 80335c06e94b977640da3bf995ed1360bd9c549e
......@@ -20,7 +20,7 @@ Executable ghc-pkg
Build-Depends: base >= 4 && < 5,
directory >= 1 && < 1.3,
process >= 1 && < 1.2,
process >= 1 && < 1.3,
filepath,
Cabal,
binary,
......
......@@ -21,7 +21,7 @@ Executable runghc
if flag(base3)
Build-Depends: base >= 3 && < 5,
directory >= 1 && < 1.3,
process >= 1 && < 1.2
process >= 1 && < 1.3
else
Build-Depends: base < 3
Build-Depends: filepath
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment