[commit: ghc] master: Update time submodule to v1.6 release (bcc213d)

git at git.haskell.org git at git.haskell.org
Sun Dec 20 10:03:56 UTC 2015


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

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

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

commit bcc213db535bbf796f6a520f67145ba4715add61
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 10:26:54 2015 +0100

    Update time submodule to v1.6 release
    
    This is the designated release to go with GHC 8.0.1
    
    /cc @AshleyYakeley


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

bcc213db535bbf796f6a520f67145ba4715add61
 compiler/ghc.cabal.in | 2 +-
 libraries/Cabal       | 2 +-
 libraries/directory   | 2 +-
 libraries/hpc         | 2 +-
 libraries/time        | 2 +-
 libraries/unix        | 2 +-
 mk/warnings.mk        | 4 +---
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index e816133..da8fce2 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -49,7 +49,7 @@ Library
                    process    >= 1   && < 1.5,
                    bytestring >= 0.9 && < 0.11,
                    binary     == 0.8.*,
-                   time                 < 1.6,
+                   time       >= 1.4 && < 1.7,
                    containers >= 0.5 && < 0.6,
                    array      >= 0.1 && < 0.6,
                    filepath   >= 1   && < 1.5,
diff --git a/libraries/Cabal b/libraries/Cabal
index e275a16..50ccb66 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit e275a162ccac087f8b25b424551e8a1598dd5943
+Subproject commit 50ccb668e866ccbe35a1982bf81750cec7aea382
diff --git a/libraries/directory b/libraries/directory
index 4dcb287..5696798 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 4dcb2873166558575fe70142da87952bd558f943
+Subproject commit 5696798a0adbf3401688f223fe64a4aa6378e87b
diff --git a/libraries/hpc b/libraries/hpc
index 5123582..a6dee68 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 5123582f48b46efc3d27424bc475125a1de78e2e
+Subproject commit a6dee68551ce931e2d2184c47c0e64180618450a
diff --git a/libraries/time b/libraries/time
index 8d3c90a..409d7a0 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 8d3c90a420c8985dcc439766c028821cea7dc848
+Subproject commit 409d7a01659c2ac331017a6ece423485bc7aaf01
diff --git a/libraries/unix b/libraries/unix
index 5d5b747..4f3b5d8 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 5d5b74716b696b0f22c37a88ccc5c114b13f0398
+Subproject commit 4f3b5d8b87eef07d8df62a8d7240830bb81a8a6b
diff --git a/mk/warnings.mk b/mk/warnings.mk
index e2b80be..4420601 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -55,9 +55,7 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 # haddock's attoparsec uses deprecated `inlinePerformIO`
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
 
-# not yet de-tabbed
-libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-tabs
-# On Windows, there are also some unused import warnings
+# On Windows, there are/were some unused import warnings
 ifeq "$(HostOS_CPP)" "mingw32"
 libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities
 endif



More information about the ghc-commits mailing list