summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Scott <ryan.gl.scott@gmail.com>2018-04-19 08:31:08 -0400
committerRyan Scott <ryan.gl.scott@gmail.com>2018-04-19 08:31:08 -0400
commit2fdfe056812ec469a05f46f228ef076942297b5f (patch)
treef73e926e4ca80e225214511bfd01e14b0611f27d
parent447d1264abcd52bdd98267d109bfc1ff1c96ad27 (diff)
downloadhaskell-2fdfe056812ec469a05f46f228ef076942297b5f.tar.gz
Bump unix submodule to version 2.8.0.0
Summary: Requires bumping several submodules. Test Plan: ./validate Reviewers: hvr, bgamari Subscribers: thomie, carter GHC Trac Issues: #15042 Differential Revision: https://phabricator.haskell.org/D4604
-rw-r--r--compiler/ghc.cabal.in2
-rw-r--r--ghc/ghc-bin.cabal.in2
-rw-r--r--iserv/iserv-bin.cabal4
m---------libraries/Cabal0
-rw-r--r--libraries/base/tests/IO/T2122.hs4
-rw-r--r--libraries/base/tests/T7773.hs4
m---------libraries/directory0
-rw-r--r--libraries/ghci/ghci.cabal.in2
m---------libraries/haskeline0
m---------libraries/process0
m---------libraries/unix0
11 files changed, 9 insertions, 9 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 36dc437cd7..2a4d9755bd 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -71,7 +71,7 @@ Library
else
if flag(terminfo)
Build-Depends: terminfo == 0.4.*
- Build-Depends: unix == 2.7.*
+ Build-Depends: unix >= 2.7 && < 2.9
GHC-Options: -Wall
-Wno-name-shadowing
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index c94c6f8013..12812ef07c 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -40,7 +40,7 @@ Executable ghc
if os(windows)
Build-Depends: Win32 >= 2.3 && < 2.7
else
- Build-Depends: unix == 2.7.*
+ Build-Depends: unix >= 2.7 && < 2.9
C-Sources: hschooks.c
diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index a713e6fbdb..b2695093ee 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -92,7 +92,7 @@ Library
if os(windows)
Cpp-Options: -DWINDOWS
else
- Build-Depends: unix >= 2.7 && < 2.8
+ Build-Depends: unix >= 2.7 && < 2.9
Executable iserv
Default-Language: Haskell2010
@@ -117,7 +117,7 @@ Executable iserv
if os(windows)
Cpp-Options: -DWINDOWS
else
- Build-Depends: unix >= 2.7 && < 2.8
+ Build-Depends: unix >= 2.7 && < 2.9
Executable iserv-proxy
If flag(proxy)
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject c219cd3f31c8e4e4bc71f93bbcd4de87830a986
+Subproject 335fa8d82520bad1a6980fd55230e65889c9986
diff --git a/libraries/base/tests/IO/T2122.hs b/libraries/base/tests/IO/T2122.hs
index 9a8badc216..488d2434bc 100644
--- a/libraries/base/tests/IO/T2122.hs
+++ b/libraries/base/tests/IO/T2122.hs
@@ -51,9 +51,9 @@ test causeFailure =
-- probably because openFd does not try to lock the file
test2 :: Bool -> IO ()
test2 causeFailure =
- do fd1 <- openFd fp ReadOnly Nothing defaultFileFlags `catchIOError` (\e -> error ("openFile 1: " ++ show e))
+ do fd1 <- openFd fp ReadOnly defaultFileFlags `catchIOError` (\e -> error ("openFile 1: " ++ show e))
when causeFailure $ do
- fd2 <- openFd fp ReadOnly Nothing defaultFileFlags `catchIOError` (\e -> error ("openFile 2: " ++ show e))
+ fd2 <- openFd fp ReadOnly defaultFileFlags `catchIOError` (\e -> error ("openFile 2: " ++ show e))
closeFd fd2
closeFd fd1
removeFile fp
diff --git a/libraries/base/tests/T7773.hs b/libraries/base/tests/T7773.hs
index 495cd7abd9..7f73b12f3b 100644
--- a/libraries/base/tests/T7773.hs
+++ b/libraries/base/tests/T7773.hs
@@ -3,7 +3,7 @@ import System.Posix.IO
main = do
putStrLn "hello"
- fd <- openFd "/dev/random" ReadOnly Nothing defaultFileFlags
+ fd <- openFd "/dev/random" ReadOnly defaultFileFlags
threadWaitRead fd
putStrLn "goodbye"
- \ No newline at end of file
+
diff --git a/libraries/directory b/libraries/directory
-Subproject 6f3a1823b56f47cc17a9d39897965d47d6b2cbb
+Subproject 9c474f0d287b143c43dff275db0640d358e323c
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 595f8deb76..05655d03c3 100644
--- a/libraries/ghci/ghci.cabal.in
+++ b/libraries/ghci/ghci.cabal.in
@@ -81,4 +81,4 @@ library
transformers == 0.5.*
if !os(windows)
- Build-Depends: unix == 2.7.*
+ Build-Depends: unix >= 2.7 && < 2.9
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 019e08f2c91b7cc45e5fb98189193a9f5c2d2d5
+Subproject 481b890e8616d9e85da69173d5079ad49f9fb83
diff --git a/libraries/process b/libraries/process
-Subproject 7c0b58141290b50a338bf391adc0a8c43513165
+Subproject 78c338b2ad06f0a3ed4ace7d95cc68ddb87ab20
diff --git a/libraries/unix b/libraries/unix
-Subproject 41c5776162b60e0739a7559ceab03b9c3a44451
+Subproject c9ec0b00012e5eb447ff021091f86efe31be8ab