[commit: ghc] master: Bump unix submodule to version 2.8.0.0 (2fdfe05)

git at git.haskell.org git at git.haskell.org
Thu Apr 19 12:52:57 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2fdfe056812ec469a05f46f228ef076942297b5f/ghc

>---------------------------------------------------------------

commit 2fdfe056812ec469a05f46f228ef076942297b5f
Author: Ryan Scott <ryan.gl.scott at gmail.com>
Date:   Thu Apr 19 08:31:08 2018 -0400

    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


>---------------------------------------------------------------

2fdfe056812ec469a05f46f228ef076942297b5f
 compiler/ghc.cabal.in            | 2 +-
 ghc/ghc-bin.cabal.in             | 2 +-
 iserv/iserv-bin.cabal            | 4 ++--
 libraries/Cabal                  | 2 +-
 libraries/base/tests/IO/T2122.hs | 4 ++--
 libraries/base/tests/T7773.hs    | 2 +-
 libraries/directory              | 2 +-
 libraries/ghci/ghci.cabal.in     | 2 +-
 libraries/haskeline              | 2 +-
 libraries/process                | 2 +-
 libraries/unix                   | 2 +-
 11 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index 36dc437..2a4d975 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 c94c6f8..12812ef 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 a713e6f..b269509 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
index c219cd3..335fa8d 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit c219cd3f31c8e4e4bc71f93bbcd4de87830a986d
+Subproject commit 335fa8d82520bad1a6980fd55230e65889c99860
diff --git a/libraries/base/tests/IO/T2122.hs b/libraries/base/tests/IO/T2122.hs
index 9a8badc..488d243 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 495cd7a..7f73b12 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"
 
diff --git a/libraries/directory b/libraries/directory
index 6f3a182..9c474f0 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 6f3a1823b56f47cc17a9d39897965d47d6b2cbb4
+Subproject commit 9c474f0d287b143c43dff275db0640d358e323cc
diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in
index 595f8de..05655d0 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
index 019e08f..481b890 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 019e08f2c91b7cc45e5fb98189193a9f5c2d2d57
+Subproject commit 481b890e8616d9e85da69173d5079ad49f9fb83d
diff --git a/libraries/process b/libraries/process
index 7c0b581..78c338b 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 7c0b58141290b50a338bf391adc0a8c43513165b
+Subproject commit 78c338b2ad06f0a3ed4ace7d95cc68ddb87ab207
diff --git a/libraries/unix b/libraries/unix
index 41c5776..c9ec0b0 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 41c5776162b60e0739a7559ceab03b9c3a444516
+Subproject commit c9ec0b00012e5eb447ff021091f86efe31be8abf



More information about the ghc-commits mailing list